-/gitweb/gitweb.min.*

- gitdiffcore.txt gitworkflows.txt

-* Setting core.sharerepository to traditional "true" value was supposed to make

-* Some systems needs to use compatibility fnmach and regex libraries

- presense of the corresponding *.pack file before downloading *.idx

- on its own after user-supplied message, which should have overrided the

-* With help.autocorrect set to non-zero value, the logic to guess typoes

-during the entire transtion period, and ended up panicking on the day

- ammount of whitespace and nothing else. and "git diff -b" showed the

- * "fiter-branch" command incorrectly said --prune-empty and --filter-commit

-Git v1.7.2 Release Notes (draft)

-================================

- had percent-encoded characters (638794c, 9d2e942).

-

- * "git commit" did not honor GIT_REFLOG_ACTION environment variable, resulting

- reflog messages for cherry-pick and revert actions to be recorded as "commit".

-

- * "git clone/fetch/pull" issued an incorrect error message when a ref and

- a symref that points to the ref were updated at the same time. This

- obviously would update them to the same value, and should not result in

- an error condition (0e71bc3).

- * "git diff" inside a tree with many pathnames that have certain

- characters has become very slow in 1.7.0 by mistake (will merge

- e53e6b443 to 'maint').

-

---

-exec >/var/tmp/1

-O=v1.7.2-rc0-60-g2927a50

-echo O=$(git describe HEAD)

-git shortlog --no-merges HEAD ^maint ^$O

- merge to avoid overwritting local changes.

- that multiple deltafied objects reference. By storing the

- not remove `\r` from lines ending with `\r\n`. Can be overrriden

- Additional "Cc:" headers to include in a patch to be submitted

- by mail. See the --cc option in linkgit:git-format-patch[1].

- the '-k' mode will be left blank so cvs clients will

- The module path for an apache httpd used by linkgit:git-instaweb[1].

- branch heads.

--B::

- Break complete rewrite changes into pairs of delete and create.

-

--M::

--C::

- This option disables this automatic tag following.

- downloaded.

- [--refresh] [--ignore-errors] [--] [<filepattern>...]

- Don't actually add the file(s), just show if they exist.

-only reviewed by the commiter.

- the "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].

-reference name expressions (see linkgit:git-rev-parse[1]):

-fatal: Entry 'frotz' not uptodate. Cannot merge.

- For a more complete list of ways to spell commits, see the

- "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].

- is primarily for use by foreign scm interface scripts.

- scm interface scripts. It allows you to create a commit with an

- * If timestamps of commits in the cvs repository are not stable enough

- never added in cvs.

-which causes the cvs client to treat them as a text files, subject

-to crlf conversion on some platforms.

-"SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].

-"SPECIFYING RANGES" section in linkgit:git-rev-parse[1].

- ``SPECIFYING REVISIONS'' in linkgit:git-rev-parse[1] for details.

- REVISIONS" section in linkgit:git-rev-parse[1]) means the

- have been chosen by the attributes mechanism, including crlf

-:git-log: 1

-include::diff-options.txt[]

-

- and <until>, see "SPECIFYING REVISIONS" section in

- linkgit:git-rev-parse[1].

-

---follow::

- Continue listing the history of a file beyond renames/copies.

- Identify the file status with the following tags (followed by

- a space) at the start of each line:

-'git pull' <options> <repository> <refspec>...

-Runs 'git fetch' with the given parameters, and calls 'git merge'

-to merge the retrieved head(s) into the current branch.

-With `--rebase`, calls 'git rebase' instead of 'git merge'.

-Note that you can use `.` (current directory) as the

-<repository> to pull from the local repository -- this is useful

-when merging local branches into the current branch.

-Also note that options meant for 'git pull' itself and underlying

-'git merge' must be given before the options meant for 'git fetch'.

-*Warning*: Running 'git pull' (actually, the underlying 'git merge')

-in a state that is hard to back out of in the case of a conflict.

-`HEAD` (see linkgit:git-rev-parse[1]).

- `<old>...<new>` for forced non-fast-forward updates). For a

- failed update, more details are given for the failure.

- The string `rejected` indicates that git did not try to send the

- ref at all (typically because it is not a fast-forward). The

- string `remote rejected` indicates that the remote end refused

- the update; this rejection is typically caused by a hook on the

- remote side. The string `remote failure` indicates that the

- remote end did not report the successful update of the ref

- (perhaps because of a temporary error on the remote side, a

- break in the network connection, or other transient error).

-point to one week ago", and so on. See linkgit:git-rev-parse[1] for

-'git request-pull' <start> <url> [<end>]

-'git reset' [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]

-Sets the current head to the specified commit and optionally resets the

-index and working tree to match.

-

-This command is useful if you notice some small error in a recent

-commit (or set of commits) and want to redo that part without showing

-the undo in the history.

-

-If you want to undo a commit other than the latest on a branch,

-linkgit:git-revert[1] is your friend.

-

-The second and third forms with 'paths' and/or --patch are used to

-revert selected paths in the index from a given commit, without moving

-HEAD.

-

-OPTIONS

--------

---mixed::

- Resets the index but not the working tree (i.e., the changed files

- are preserved but not marked for commit) and reports what has not

- been updated. This is the default action.

--p::

---patch::

- Interactively select hunks in the difference between the index

- and <commit> (defaults to HEAD). The chosen hunks are applied

- in reverse to the index.

-+

-This means that `git reset -p` is the opposite of `git add -p` (see

-linkgit:git-add[1]).

-<commit>::

- Commit to make the current HEAD. If not given defaults to HEAD.

-

-DISCUSSION

-----------

-The tables below show what happens when running:

-

-----------

-git reset --option target

-----------

-

-to reset the HEAD to another commit (`target`) with the different

-reset options depending on the state of the files.

-

-In these tables, A, B, C and D are some different states of a

-file. For example, the first line of the first table means that if a

-file is in state A in the working tree, in state B in the index, in

-state C in HEAD and in state D in the target, then "git reset --soft

-target" will put the file in state A in the working tree, in state B

-in the index and in state D in HEAD.

-

- working index HEAD target working index HEAD

- ----------------------------------------------------

- A B C D --soft A B D

- --mixed A D D

- --hard D D D

- --merge (disallowed)

- --keep (disallowed)

-

- working index HEAD target working index HEAD

- ----------------------------------------------------

- A B C C --soft A B C

- --mixed A C C

- --hard C C C

- --merge (disallowed)

- --keep A C C

-

- working index HEAD target working index HEAD

- ----------------------------------------------------

- B B C D --soft B B D

- --mixed B D D

- --hard D D D

- --merge D D D

- --keep (disallowed)

-

- working index HEAD target working index HEAD

- ----------------------------------------------------

- B B C C --soft B B C

- --mixed B C C

- --hard C C C

- --merge C C C

- --keep B C C

-

- working index HEAD target working index HEAD

- ----------------------------------------------------

- B C C D --soft B C D

- --mixed B D D

- --hard D D D

- --merge (disallowed)

- --keep (disallowed)

-

- working index HEAD target working index HEAD

- ----------------------------------------------------

- B C C C --soft B C C

- --mixed B C C

- --hard C C C

- --merge B C C

- --keep B C C

-

-"reset --merge" is meant to be used when resetting out of a conflicted

-merge. Any mergy operation guarantees that the work tree file that is

-involved in the merge does not have local change wrt the index before

-it starts, and that it writes the result out to the work tree. So if

-we see some difference between the index and the target and also

-between the index and the work tree, then it means that we are not

-resetting out from a state that a mergy operation left after failing

-with a conflict. That is why we disallow --merge option in this case.

-

-"reset --keep" is meant to be used when removing some of the last

-commits in the current branch while keeping changes in the working

-tree. If there could be conflicts between the changes in the commit we

-want to remove and the changes in the working tree we want to keep,

-the reset is disallowed. That's why it is disallowed if there are both

-changes between the working tree and HEAD, and between HEAD and the

-target. To be safe, it is also disallowed when there are unmerged

-entries.

-

-The following tables show what happens when there are unmerged

-entries:

-

- working index HEAD target working index HEAD

- ----------------------------------------------------

- X U A B --soft (disallowed)

- --mixed X B B

- --hard B B B

- --merge B B B

- --keep (disallowed)

-

- working index HEAD target working index HEAD

- ----------------------------------------------------

- X U A A --soft (disallowed)

- --mixed X A A

- --hard A A A

- --merge A A A

- --keep (disallowed)

-

-X means any state and U means an unmerged index.

-

-Examples

-Undo commits permanently::

-+

-------------

-$ git commit ...

-$ git reset --hard HEAD~3 <1>

-------------

-+

-<1> The last three commits (HEAD, HEAD^, and HEAD~2) were bad

-and you do not want to ever see them again. Do *not* do this if

-you have already given these commits to somebody else. (See the

-"RECOVERING FROM UPSTREAM REBASE" section in linkgit:git-rebase[1] for

-the implications of doing so.)

-

-Undo add::

-$ edit <1>

-$ git add frotz.c filfre.c

-$ mailx <2>

-$ git reset <3>

-$ git pull git://info.example.com/ nitfol <4>

-<1> You are happily working on something, and find the changes

-in these files are in good order. You do not want to see them

-when you run "git diff", because you plan to work on other files

-and changes with these files are distracting.

-<2> Somebody asks you to pull, and the changes sounds worthy of merging.

-<3> However, you already dirtied the index (i.e. your index does

-not match the HEAD commit). But you know the pull you are going

-to make does not affect frotz.c nor filfre.c, so you revert the

-index changes for these two files. Your changes in working tree

-remain there.

-<4> Then you can pull and merge, leaving frotz.c and filfre.c

-changes still in the working tree.

-with what you commited previously. You can start a new branch and

-SPECIFYING REVISIONS

---------------------

-

-A revision parameter typically, but not necessarily, names a

-commit object. They use what is called an 'extended SHA1'

-syntax. Here are various ways to spell object names. The

-ones listed near the end of this list are to name trees and

-blobs contained in a commit.

-

-* The full SHA1 object name (40-byte hexadecimal string), or

- a substring of such that is unique within the repository.

- E.g. dae86e1950b1277e545cee180551750029cfe735 and dae86e both

- name the same commit object if there are no other object in

- your repository whose object name starts with dae86e.

-

-* An output from 'git describe'; i.e. a closest tag, optionally

- followed by a dash and a number of commits, followed by a dash, a

- `g`, and an abbreviated object name.

-

-* A symbolic ref name. E.g. 'master' typically means the commit

- object referenced by refs/heads/master. If you

- happen to have both heads/master and tags/master, you can

- explicitly say 'heads/master' to tell git which one you mean.

- When ambiguous, a `<name>` is disambiguated by taking the

- first match in the following rules:

-

- . if `$GIT_DIR/<name>` exists, that is what you mean (this is usually

- useful only for `HEAD`, `FETCH_HEAD`, `ORIG_HEAD` and `MERGE_HEAD`);

-

- . otherwise, `refs/<name>` if exists;

-

- . otherwise, `refs/tags/<name>` if exists;

-

- . otherwise, `refs/heads/<name>` if exists;

-

- . otherwise, `refs/remotes/<name>` if exists;

-

- . otherwise, `refs/remotes/<name>/HEAD` if exists.

-+

-HEAD names the commit your changes in the working tree is based on.

-FETCH_HEAD records the branch you fetched from a remote repository

-with your last 'git fetch' invocation.

-ORIG_HEAD is created by commands that moves your HEAD in a drastic

-way, to record the position of the HEAD before their operation, so that

-you can change the tip of the branch back to the state before you ran

-them easily.

-MERGE_HEAD records the commit(s) you are merging into your branch

-when you run 'git merge'.

-+

-Note that any of the `refs/*` cases above may come either from

-the `$GIT_DIR/refs` directory or from the `$GIT_DIR/packed-refs` file.

-

-* A ref followed by the suffix '@' with a date specification

- enclosed in a brace

- pair (e.g. '\{yesterday\}', '\{1 month 2 weeks 3 days 1 hour 1

- second ago\}' or '\{1979-02-26 18:30:00\}') to specify the value

- of the ref at a prior point in time. This suffix may only be

- used immediately following a ref name and the ref must have an

- existing log ($GIT_DIR/logs/<ref>). Note that this looks up the state

- of your *local* ref at a given time; e.g., what was in your local

- `master` branch last week. If you want to look at commits made during

- certain times, see `--since` and `--until`.

-

-* A ref followed by the suffix '@' with an ordinal specification

- enclosed in a brace pair (e.g. '\{1\}', '\{15\}') to specify

- the n-th prior value of that ref. For example 'master@\{1\}'

- is the immediate prior value of 'master' while 'master@\{5\}'

- is the 5th prior value of 'master'. This suffix may only be used

- immediately following a ref name and the ref must have an existing

- log ($GIT_DIR/logs/<ref>).

-

-* You can use the '@' construct with an empty ref part to get at a

- reflog of the current branch. For example, if you are on the

- branch 'blabla', then '@\{1\}' means the same as 'blabla@\{1\}'.

-

-* The special construct '@\{-<n>\}' means the <n>th branch checked out

- before the current one.

-

-* The suffix '@\{upstream\}' to a ref (short form 'ref@\{u\}') refers to

- the branch the ref is set to build on top of. Missing ref defaults

- to the current branch.

-

-* A suffix '{caret}' to a revision parameter (e.g. 'HEAD{caret}') means the first parent of

- that commit object. '{caret}<n>' means the <n>th parent (i.e.

- 'rev{caret}'

- is equivalent to 'rev{caret}1'). As a special rule,

- 'rev{caret}0' means the commit itself and is used when 'rev' is the

- object name of a tag object that refers to a commit object.

-

-* A suffix '{tilde}<n>' to a revision parameter means the commit

- object that is the <n>th generation grand-parent of the named

- commit object, following only the first parent. I.e. rev~3 is

- equivalent to rev{caret}{caret}{caret} which is equivalent to

- rev{caret}1{caret}1{caret}1. See below for a illustration of

- the usage of this form.

-

-* A suffix '{caret}' followed by an object type name enclosed in

- brace pair (e.g. `v0.99.8{caret}\{commit\}`) means the object

- could be a tag, and dereference the tag recursively until an

- object of that type is found or the object cannot be

- dereferenced anymore (in which case, barf). `rev{caret}0`

- introduced earlier is a short-hand for `rev{caret}\{commit\}`.

-

-* A suffix '{caret}' followed by an empty brace pair

- (e.g. `v0.99.8{caret}\{\}`) means the object could be a tag,

- and dereference the tag recursively until a non-tag object is

- found.

-

-* A colon, followed by a slash, followed by a text (e.g. `:/fix nasty bug`): this names

- a commit whose commit message starts with the specified text.

- This name returns the youngest matching commit which is

- reachable from any ref. If the commit message starts with a

- '!', you have to repeat that; the special sequence ':/!',

- followed by something else than '!' is reserved for now.

-

-* A suffix ':' followed by a path (e.g. `HEAD:README`); this names the blob or tree

- at the given path in the tree-ish object named by the part

- before the colon.

- ':path' (with an empty part before the colon, e.g. `:README`)

- is a special case of the syntax described next: content

- recorded in the index at the given path.

-

-* A colon, optionally followed by a stage number (0 to 3) and a

- colon, followed by a path (e.g. `:0:README`); this names a blob object in the

- index at the given path. Missing stage number (and the colon

- that follows it, e.g. `:README`) names a stage 0 entry. During a merge, stage

- 1 is the common ancestor, stage 2 is the target branch's version

- (typically the current branch), and stage 3 is the version from

- the branch being merged.

-

-Here is an illustration, by Jon Loeliger. Both commit nodes B

-and C are parents of commit node A. Parent commits are ordered

-left-to-right.

-

-........................................

-G H I J

- \ / \ /

- D E F

- \ | / \

- \ | / |

- \|/ |

- B C

- \ /

- \ /

- A

-........................................

-

- A = = A^0

- B = A^ = A^1 = A~1

- C = A^2 = A^2

- D = A^^ = A^1^1 = A~2

- E = B^2 = A^^2

- F = B^3 = A^^3

- G = A^^^ = A^1^1^1 = A~3

- H = D^2 = B^^2 = A^^^2 = A~2^2

- I = F^ = B^3^ = A^^3^

- J = F^2 = B^3^2 = A^^3^2

-

-

-SPECIFYING RANGES

------------------

-

-History traversing commands such as 'git log' operate on a set

-of commits, not just a single commit. To these commands,

-specifying a single revision with the notation described in the

-previous section means the set of commits reachable from that

-commit, following the commit ancestry chain.

-

-To exclude commits reachable from a commit, a prefix `{caret}`

-notation is used. E.g. `{caret}r1 r2` means commits reachable

-from `r2` but exclude the ones reachable from `r1`.

-

-This set operation appears so often that there is a shorthand

-for it. When you have two commits `r1` and `r2` (named according

-to the syntax explained in SPECIFYING REVISIONS above), you can ask

-for commits that are reachable from r2 excluding those that are reachable

-from r1 by `{caret}r1 r2` and it can be written as `r1..r2`.

-

-A similar notation `r1\...r2` is called symmetric difference

-of `r1` and `r2` and is defined as

-`r1 r2 --not $(git merge-base --all r1 r2)`.

-It is the set of commits that are reachable from either one of

-`r1` or `r2` but not from both.

-

-Two other shorthands for naming a set that is formed by a commit

-and its parent commits exist. The `r1{caret}@` notation means all

-parents of `r1`. `r1{caret}!` includes commit `r1` but excludes

-all of its parents.

-

-Here are a handful of examples:

-

- D G H D

- D F G H I J D F

- ^G D H D

- ^D B E I J F B

- B...C G H D E B C

- ^D B C E I J F B C

- C^@ I J F

- F^! D G H D F

-understand, and echoes on the standard output a line suitable for `sh(1)` `eval`

-eval `echo "$OPTS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?`

- "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].

- Arbitrary extended SHA1 expression (see linkgit:git-rev-parse[1])

-linkgit:git-ls-remote[1]

- "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].

-'git submodule' [--quiet] add [-b branch]

-* link:v1.7.1.1/git.html[documentation for release 1.7.1.1]

-* link:v1.7.0.6/git.html[documentation for release 1.7.0.6]

-"SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].

-branch head. Please see linkgit:git-rev-parse[1] if you want to

- "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].

-ascii file containing `gitdir: <path>`, i.e. the path to the

-recreate it as a new commit with the same changes in it. The rebase commmand's

---format[='<format>']::

-Server can send, and client understand PACKv2 with delta refering to

-For local respositories, also supported by git natively, the following

-REVISIONS" section of linkgit:git-rev-parse[1].

-linkgit:git-rev-parse[1] man page for the complete list of ways to

-(See linkgit:git-rev-parse[1] for explanations of commit-selecting

-section of linkgit:git-rev-parse[1] for details.

-DEF_VER=v1.7.1.GIT

-http.o http-walker.o http-push.o remote-curl.o: http.h

- { $(RM) "$$execdir/git$X" && \

- ln "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \

- cp "$$bindir/git$X" "$$execdir/git$X"; } ; } && \

- { for p in $(BUILT_INS); do \

- done; } && \

- { test x"$(REMOTE_CURL_ALIASES)" = x || \

- { for p in $(REMOTE_CURL_ALIASES); do \

- done; } ; } && \

-Documentation/RelNotes-1.7.2.txt \ No newline at end of file

-#define say(a) do {} while(0)

-#define say1(a,b) do {} while(0)

-#define say2(a,b,c) do {} while(0)

-static int ignore_add_errors, addremove, intent_to_add;

- && !file_exists(pathspec[i]))

- die("pathspec '%s' did not match any files",

- pathspec[i]);

- if (get_current_sha1(patch->new_name, sha1) ||

- get_current_sha1(patch->old_name, sha1))

- * (1) if dashdash_pos != 0, its either

- * (2) otherwise, its one of the two:

- if (argc == 3 && !strcmp(argv[1], "--branch")) {

- struct strbuf sb = STRBUF_INIT;

-

- if (strbuf_check_branch_ref(&sb, argv[2]))

- die("'%s' is not a valid branch name", argv[2]);

- printf("%s\n", sb.buf + 11);

- exit(0);

- }

- if (argc == 3 && !strcmp(argv[1], "--print")) {

- char *refname = xmalloc(strlen(argv[2]) + 1);

-

- if (check_ref_format(argv[2]))

- exit(1);

- collapse_slashes(refname, argv[2]);

- printf("%s\n", refname);

- exit(0);

- }

- rev.abbrev = 0;

- { OPTION_STRING, 'u', "untracked-files", &untracked_files_arg, "mode", "show untracked files, optional modes: all, normal, no. (Default: all)", PARSE_OPT_OPTARG, NULL, (intptr_t)"all" },

- if (write_cache(fd, active_cache, active_nr) ||

- commit_locked_index(&index_lock))

- die("unable to write new_index file");

- if (!write_cache(fd, active_cache, active_nr))

- rollback_lock_file(&index_lock);

- rev.abbrev = 0;

- else if ((ents == 3) && (ent[0].item->flags & UNINTERESTING)) {

- /* diff A...B where there is one sane merge base between

- * A and B. We have ent[0] == merge-base, ent[1] == A,

- * and ent[2] == B. Show diff between the base and B.

- ent[1] = ent[2];

- }

- else

- ent, ents);

- if (transport->remote->fetch_tags == 2 && tags != TAGS_UNSET)

- tags = TAGS_SET;

- if (transport->remote->fetch_tags == -1)

- tags = TAGS_UNSET;

- die("Where do you want to fetch from today?");

- v->s = find_unique_abbrev(obj->sha1, DEFAULT_ABBREV);

- execlp(path, "emacsclient", "-e", man_page.buf, NULL);

- execlp(path, filename, "newTab", man_page.buf, NULL);

- execlp(path, "man", page, NULL);

- execl("/bin/sh", "sh", "-c", shell_cmd.buf, NULL);

- execlp("info", "info", "gitman", page, NULL);

- execl_git_cmd("web--browse", "-c", "help.browser", path, NULL);

- /*

- * We get called through "git reflog", so unlike the other log

- * routines, we need to set up our pager manually..

- */

- setup_pager();

-

- return merge_file(entry->path, base, our, their, size);

- OPT_BOOLEAN('n', NULL, &show_only, "do not remove, show only"),

- OPT_BOOLEAN('v', NULL, &verbose, "report pruned notes"),

- OPT_BOOLEAN('n', NULL, &show_only,

- OPT_BOOLEAN('v', NULL, &verbose,

- "report pruned objects"),

- "Merge the remote changes before pushing again. See the 'Note about\n"

- "fast-forwards' section of 'git push --help' for details.\n");

- *

- * The same holds true if we are switching between two trees

- * using read-tree -m A B. The index must match B after that.

- else if (nr_trees == 2 && opts.merge)

- prime_cache_tree(&active_cache_tree, trees[1]);

- then = rerere_created_at(e->d_name);

- if (!then)

- continue;

- cutoff = (has_rerere_resolution(e->d_name)

- ? cutoff_resolve : cutoff_noresolve);

- unlink_or_warn(git_path("rr-cache/MERGE_RR"));

- keep_dashdash ? PARSE_OPT_KEEP_DASHDASH : 0 |

- stop_at_non_option ? PARSE_OPT_STOP_AT_NON_OPTION : 0 |

- if (mode != S_IFGITLINK && !missing_ok && !has_sha1_file(sha1))

- } while(0)

- time_t_to_filetime(times->modtime, &mft);

- time_t_to_filetime(times->actime, &aft);

- * Determines the absolute path of cmd using the the split path in path.

- ensured by making all allocations from the the `lowest' part of any

- the (virtual) concatenation of STRING1 and STRING2 (of length SIZE1

- --summary --root HEAD --`

- Subject: ${emailprefix}$projectdesc $refname_type, $short_refname, ${change_type}d. $describe

-# make sure the the links use full paths

-# create the links to the original repo. explictly exclude index, HEAD and

- entries = (bufsize - 1) / RABIN_WINDOW;

- strbuf_addf(msg, "%s%sindex %s..", set,

- line_prefix,

- if (*namep && **namep != '/')

- if (*otherp && **otherp != '/')

- memset(&diff_queued_diff, 0, sizeof(diff_queued_diff));

- /* We never run this function more than one time, because the

- * rename/copy detection logic can only run once.

- */

- if (diff_queued_diff.run)

- return;

-

- if (options->break_opt != -1)

- diffcore_break(options->break_opt);

- if (options->detect_rename)

- diffcore_rename(options);

- if (options->break_opt != -1)

- diffcore_merge_broken();

- diff_resolve_rename_copy();

- diff_queued_diff.run = 1;

-#define DEFAULT_MERGE_SCORE 36000 /* maximum for break-merge to happen 60%) */

- int run;

- (q)->run = 0; \

- } while(0);

-#define diff_debug_filespec(a,b,c) do {} while(0)

-#define diff_debug_filepair(a,b) do {} while(0)

-#define diff_debug_queue(a,b) do {} while(0)

-static struct dir_entry *dir_add_ignored(struct dir_struct *dir, const char *pathname, int len)

- dump_marks_helper(f, (base + k) << m->shift,

- -title [mc "git-gui: fatal error"] \

- eval exec $explorer $_gitworktree &

- || {T_} eq $state} {

-catch {

-set gm $repo_config(gui.geometry)

-wm geometry . [lindex $gm 0]

-if {$use_ttk} {

- .vpane sashpos 0 [lindex $gm 1]

- .vpane.files sashpos 0 [lindex $gm 2]

-} else {

- .vpane sash place 0 \

- [lindex $gm 1] \

- [lindex [.vpane sash coord 0] 1]

- .vpane.files sash place 0 \

- [lindex [.vpane.files sash coord 0] 0] \

- [lindex $gm 2]

-unset gm

-catch {

-set gws $repo_config(gui.wmstate)

-wm state . $gws

-unset gws

- set fd [open $path r]

- set fd [git_read cat-file blob "$commit:$path"]

- -accelerator $M1T-C \

- bind $top <$M1B-c> [cb _next clone]

- bind $top <$M1B-C> [cb _next clone]

- if {[lindex $s 0] ne {_M}} return

- [file normalize [$_gitworktree]]

- [file normalize [$_gitworktree]]

- [file join $oguilib win32_shortcut.js] \

- [file join $oguilib git-gui.ico] \

-set bindir [file dirname \

-set bindir [file join $bindir bin]

- *apache2*|*lighttpd*)

- test -z "$module_path" && module_path=/usr/lib/apache2/modules

- for mod in mime dir; do

- if test -e $module_path/mod_${mod}.so; then

-PerlPassEnv GIT_EXEC_DIR

-*apache2*)

- echo "$*" >&2

- cat "$DOTEST"/current-commit | while read current_commit

- done

- squash|s|fixup|f)

- *)

- read command sha1 rest < "$TODO"

- while read command sha1 rest

- echo "$command${sha1:+ }$sha1${rest:+ }$rest" >&$fd

- while read pick sha1 message

- echo "$pick $sha1 $message"

- while read squash action msg

- echo "$action $squash $action! $msg"

- sed -n "s/^>//p" | while read shortsha1 rest

- echo "pick $shortsha1 $rest" >> "$TODO"

- echo "pick $shortsha1 $rest" >> "$TODO"

- -f|--f|--fo|--for|--forc|force|--force-r|--force-re|--force-reb|--force-reba|--force-rebas|--force-rebase|--no-ff)

- $root_flag "$revisions" |

-USAGE="[--quiet] add [-b branch] [--reference <repository>] [--] <repository> [<path>]

- git add "$path" ||

- git add .gitmodules ||

- say "Synchronizing submodule url for '$name'"

- firefox | iceweasel | chrome | chromium | konqueror | w3m | links | lynx | dillo | open | start)

- browser_candidates="firefox iceweasel chrome chromium konqueror w3m links lynx dillo"

- chrome|chromium)

- " [-c name=value\n"

- " [--help] COMMAND [ARGS]";

- { "log", cmd_log, RUN_SETUP | USE_PAGER },

- { "show", cmd_show, RUN_SETUP | USE_PAGER },

- { "whatchanged", cmd_whatchanged, RUN_SETUP | USE_PAGER },

- commit_pager_choice();

- Points to the localtion where you put gitweb.js on your web server

- If server load exceed this value then return "503 Service Unavaliable" error.

- # overriden

-# quote unsafe chars in whole URL, so some charactrs cannot be quoted

- $str =~ s/([^A-Za-z0-9\-_.~();\/;?:@&=])/sprintf("%%%02X", ord($1))/eg;

- $str =~ s/\+/%2B/g;

-# in the format expected for 'commit' view (& similia).

-# to output information for. If the list is empty it defalts to both

- # for compact combined (--cc) format, with chunk and patch simpliciaction

- # patchset might be empty, but there might be unprocessed raw lines

- if ($#commitlist >= 100) {

- }

-

- git_search_grep_body(\@commitlist, 0, 99, $next_link);

- * We added a column for the the current commit as part of

-#define curl_global_cleanup() do { /* nothing */ } while(0)

-#define curl_global_init(a) do { /* nothing */ } while(0)

- bufl = nfsnprintf(buf, sizeof(buf), cmd->cb.data ? CAP(LITERALPLUS) ?

- "%d %s{%d+}\r\n" : "%d %s{%d}\r\n" : "%d %s\r\n",

- cmd->tag, cmd->cmd, cmd->cb.dlen);

- snprintf(portstr, sizeof(portstr), "%hu", srvc->port);

- output(o, 0, "Already uptodate!");

- err = error("%s SHA1 does not match its inddex",

- * PARSE_OPT_NOARG: says that this option takes no argument

- return ce_write(c, fd, ondisk, size);

- if (log && rename(git_path("logs/%s", oldref), git_path("tmp-renamed-log")))

- return error("unable to move logfile logs/%s to tmp-renamed-log: %s",

- if (log && rename(git_path("tmp-renamed-log"), git_path("logs/%s", newref))) {

- error("unable to move logfile tmp-renamed-log to logs/%s: %s",

- rename(git_path("tmp-renamed-log"), git_path("logs/%s", oldref)))

- error("unable to restore logfile %s from tmp-renamed-log: %s",

- strbuf_read(&rpc->result, client.out, 0);

- close(client.out);

- FILE *f = fopen(path, "w");

- goto out_stale;

- break;

- break;

- int current_device = 0, one_filesystem = 1;

-/*

- * This interprets names like ':/Initial revision of "git"' by searching

- * through history and returning the first commit whose message matches

- * the given regular expression.

- *

- * For future extension, ':/!' is reserved. If you want to match a message

- * beginning with a '!', you have to repeat the exclamation mark.

- */

-

-#define ONELINE_SEEN (1u<<20)

- for f in test-results/t*-*; do \

- * ok 1: .git/objects should be empty after git-init in an empty repo.

- * ok 2: .git/objects should have 256 subdirectories.

- * ok 3: git-update-index without --add should fail adding.

- * ok 23: no diff after checkout and git-update-index --refresh.

- * passed all 23 test(s)

- *** t0100-environment-names.sh ***

- * ok 1: using old names should issue warnings.

- * ok 2: using old names but having new names should not issue warnings.

- ...

-

-Or you can run each test individually from command line, like

-this:

-

- $ sh ./t3001-ls-files-killed.sh

- * ok 1: git-update-index --add to add various paths.

- * ok 2: git-ls-files -k to show killed files.

- * ok 3: validate git-ls-files -k output.

- * passed all 3 test(s)

- - Creates an empty test directory with an empty .git/objects

- database and chdir(2) into it. This directory is 't/trash directory'

- if you must know, but I do not think you care.

- - test_expect_success <message> <script>

- This takes two strings as parameter, and evaluates the

- - test_expect_failure <message> <script>