- gitdiffcore.txt gitworkflows.txt

-Git v1.7.2 Release Notes (draft)

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

---

-exec >/var/tmp/1

-O=v1.7.2-rc1-37-g2a16315

-echo O=$(git describe HEAD)

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

- description and should skip the full stop

- - if you want your work included in git.git, add a

- "Signed-off-by: Your Name <you@example.com>" line to the

- commit message (or just use the option "-s" when

- committing) to confirm that you agree to the Developer's

- Certificate of Origin

--B::

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

-

--M::

--C::

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

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

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

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

-'git checkout' [-q] [-f] [-m] [[-b|--orphan] <new_branch>] [<start_point>]

-'git checkout' -b <new branch> [<start point>]::

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

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

-"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

-: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.

-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].

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

-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)

- else if (!is_bare_repository() && !strcmp(head, name))

-static int ignore_add_errors, addremove, intent_to_add;

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

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

- pathspec[i]);

- 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);

- }

- create_branch(old->name, opts->new_branch, new->name, 0,

- opts->new_branch ? " a new" : "",

- OPT_STRING('b', NULL, &opts.new_branch, "new branch", "branch"),

- die("--orphan and -b are mutually exclusive");

- if (!get_sha1(buf.buf, rev))

- die("git checkout: branch %s already exists", opts.new_branch);

- { 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);

- 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);

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

- 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);

- 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"),

- int nr = refspec_nr + 1;

- refspec = xrealloc(refspec, nr * sizeof(char *));

- refspec[nr-1] = ref;

- refspec_nr = nr;

- "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]);

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

- } while(0)

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

-int parse_date_toffset(const char *date, unsigned long *timestamp, int *offset)

- return 1; /* success */

- if (parse_date_toffset(date, &timestamp, &offset) > 0)

- return date_string(timestamp, offset, result, maxlen);

- else

- if (parse_date_toffset(date, &timestamp, &offset) > 0)

-

- if (parse_date_toffset(date, &timestamp, &offset) > 0) {

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

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

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

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

- } 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*)

-require 'yaml'

-options = YAML::load_file(ARGV[0])

-options[:StartCallback] = proc do

- File.open(options[:PidFile],"w") do |f|

- f.puts Process.pid

- end

-end

-options[:ServerType] = WEBrick::Daemon

- # generate a shell script to invoke the above ruby script,

- # which assumes _ruby_ is in the user's $PATH. that's _one_

- # portable way to run ruby, which could be installed anywhere,

- # really.

- cat >"$fqgitdir/gitweb/$httpd" <<EOF

-#!/bin/sh

-exec ruby "$fqgitdir/gitweb/$httpd.rb" \$*

-EOF

- chmod +x "$fqgitdir/gitweb/$httpd"

-

- cat >"$conf" <<EOF

-:Port: $port

-:DocumentRoot: "$root"

-:DirectoryIndex: ["gitweb.cgi"]

-:PidFile: "$fqgitdir/pid"

-EOF

- test "$local" = true && echo ':BindAddress: "127.0.0.1"' >> "$conf"

- 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*)

- files=$(git ls-files -u | sed -e 's/^[^ ]* //' | sort -u)

- echo Merging the files: "$files"

- git ls-files -u |

- sed -e 's/^[^ ]* //' |

- sort -u |

- 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)

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

- git add "$path" ||

- git add .gitmodules ||

- $ref_id =~ s/\@\d+$//;

- print STDERR "Initializing parent: $ref_id\n" unless $::_q > 1;

- $gs = Git::SVN->init($u, $p, $repo_id, $ref_id, 1);

- 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]";

- commit_pager_choice();

- evaluate_gitweb_config();

- # $projectroot and $projects_list might be set in gitweb config file

- $projects_list ||= $projectroot;

-

- $pre_dispatch_hook->()

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

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

-

- # configuration for 'highlight' (http://www.andre-simon.de/)

- # match by basename

- my %highlight_basename = (

- #'Program' => 'py',

- #'Library' => 'py',

- 'SConstruct' => 'py', # SCons equivalent of Makefile

- 'Makefile' => 'make',

- );

- # match by extension

- my %highlight_ext = (

- # main extensions, defining name of syntax;

- # see files in /usr/share/highlight/langDefs/ directory

- map { $_ => $_ }

- qw(py c cpp rb java css php sh pl js tex bib xml awk bat ini spec tcl),

- # alternate extensions, see /etc/highlight/filetypes.conf

- 'h' => 'c',

- map { $_ => 'cpp' } qw(cxx c++ cc),

- map { $_ => 'php' } qw(php3 php4),

- map { $_ => 'pl' } qw(perl pm), # perhaps also 'cgi'

- 'mak' => 'make',

- map { $_ => 'xml' } qw(xhtml html htm),

- );

-

- if ($#commitlist >= 100) {

- }

-

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

-#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!");

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

- close(client.out);

- 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 \

- you must ignore the return value of something (e.g. the return

- value of export is unportable) it's best to indicate so explicitly

- with a semicolon:

- export HLAGH;

- this instead of "! <git-command>" to fail when git commands

- segfault.

-PERL=${PERL:-perl}

-$PERL -w -e "

- $PERL -w -- - "$@" <<\EOF

- !(git push -v origin >output 2>&1) &&

-test_expect_success 'get --path' '

- ! test -f .git/logs/refs/heads/delta &&

- test_must_fail PAGER= git reflog show delta &&

- test -f .git/logs/refs/heads/delta &&

- PAGER= git reflog show delta

- ! test -f .git/logs/refs/heads/epsilon &&

- test_must_fail PAGER= git reflog show epsilon &&

- ! test -f .git/logs/refs/heads/epsilon &&

- test_must_fail PAGER= git reflog show epsilon

- test -f .git/logs/refs/heads/zeta &&

- test_must_fail PAGER= git reflog show zeta &&

- PAGER= git reflog show zeta

- test -f .git/logs/refs/heads/eta &&

- test_must_fail PAGER= git reflog show eta &&

- ! test -f .git/logs/refs/heads/eta &&

- test_must_fail PAGER= git reflog show eta

-date >path0

-if test_have_prereq SYMLINKS

-then

- ln -s xyzzy path1

-else

- date > path1

-fi

-mkdir path2 path3 path4

-date >path2/file2

-date >path2-junk

-date >path3/file3

-date >path3-junk

-git update-index --add path3-junk path3/file3

-

-cat >expected1 <<EOF

-expected1

-expected2

-expected3

-output

-path0

-path1

-path2-junk

-path2/file2

-EOF

-sed -e 's|path2/file2|path2/|' <expected1 >expected2

-cat <expected2 >expected3

-echo path4/ >>expected2

-

-test_expect_success \

- 'git ls-files --others to show output.' \

- 'git ls-files --others >output'

-

-test_expect_success \

- 'git ls-files --others should pick up symlinks.' \

- 'test_cmp expected1 output'

-test_expect_success \

- 'git ls-files --others --directory to show output.' \

- 'git ls-files --others --directory >output'

-test_expect_success \

- 'git ls-files --others --directory should not get confused.' \

- 'test_cmp expected2 output'

-test_expect_success \

- 'git ls-files --others --directory --no-empty-directory to show output.' \

- 'git ls-files --others --directory --no-empty-directory >output'

-test_expect_success \

- '--no-empty-directory hides empty directory' \

- 'test_cmp expected3 output'

- test -f .git/logs/refs/heads/alpha &&

- PAGER= git reflog show alpha

- ! test -f .git/logs/refs/heads/beta &&

- test_must_fail PAGER= git reflog show beta

- test -f .git/logs/refs/heads/gamma &&

- PAGER= git reflog show gamma

- test_must_fail MSG="yet another note" git notes add -c deadbeef &&

- test ! -f .git/rr-cache/MERGE_RR

- test ! -f .git/rr-cache/MERGE_RR

- !(git push -v origin +master master:retsam >output 2>&1) &&

- "git ls-files -s | sed \"s-\\t-&newsubdir/-\" |

- test -z "$(git diff HEAD directorymoved:newsubdir)"'

-test_expect_success SIMPLEPAGERTTY 'default pager is used by default' '

- unset PAGER GIT_PAGER;

- test_might_fail git config --unset core.pager &&

- rm -f default_pager_used ||

- cleanup_fail &&

- cat >$less <<-\EOF &&

- #!/bin/sh

- wc >default_pager_used

- EOF

- chmod +x $less &&

- (

- PATH=.:$PATH &&

- export PATH &&

- test_terminal git log

- ) &&

- test -e default_pager_used

-'

-test_expect_success TTY 'PAGER overrides default pager' '

- unset GIT_PAGER;

- test_might_fail git config --unset core.pager &&

- rm -f PAGER_used ||

- cleanup_fail &&

- PAGER="wc >PAGER_used" &&

- export PAGER &&

- test_terminal git log &&

- test -e PAGER_used

-'

-test_expect_success TTY 'core.pager overrides PAGER' '

- unset GIT_PAGER;

- rm -f core.pager_used ||

- cleanup_fail &&

- PAGER=wc &&

- export PAGER &&

- git config core.pager "wc >core.pager_used" &&

- test_terminal git log &&

- test -e core.pager_used

-'

-test_expect_success TTY 'GIT_PAGER overrides core.pager' '

- rm -f GIT_PAGER_used ||

- cleanup_fail &&

- git config core.pager wc &&

- GIT_PAGER="wc >GIT_PAGER_used" &&

- export GIT_PAGER &&

- test_terminal git log &&

- test -e GIT_PAGER_used

- git init addtest

- test "$(cat file3)" = "master new sub" )

-# We can't merge files from parent directories when running mergetool

-# from a subdir. Is this a bug?

-#

-#test_expect_failure 'mergetool in subdir' '

-# cd subdir && (

-# ( yes "" | git mergetool ../file1 >/dev/null 2>&1 ) &&

-# ( yes "" | git mergetool ../file2 >/dev/null 2>&1 ) &&

-# test "$(cat ../file1)" = "master updated" &&

-# test "$(cat ../file2)" = "master new" &&

-# git commit -m "branch1 resolved with mergetool - subdir" )

-#'