From ec47dcf7fe32258d5e13e85ae6fe91061f1746f4 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 16 May 2007 22:46:31 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.2-rc3-50-gfdcb7 --- git-branch.html | 4 ++-- git-branch.txt | 2 +- user-manual.html | 2 +- user-manual.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/git-branch.html b/git-branch.html index f8bd4366f..f1803a7fb 100644 --- a/git-branch.html +++ b/git-branch.html @@ -499,7 +499,7 @@ delete remote-tracking branches "todo", "html", "man"

  • delete "test" branch even if the "master" branch does not have all -commits from todo branch. +commits from test branch.

    • @@ -526,7 +526,7 @@ a branch and check it out with a single command.

    diff --git a/git-branch.txt b/git-branch.txt index 603f87f3b..8dc5171f5 100644 --- a/git-branch.txt +++ b/git-branch.txt @@ -136,7 +136,7 @@ $ git branch -D test <2> + <1> delete remote-tracking branches "todo", "html", "man" <2> delete "test" branch even if the "master" branch does not have all -commits from todo branch. +commits from test branch. Notes diff --git a/user-manual.html b/user-manual.html index 3f672cf41..5406bb892 100644 --- a/user-manual.html +++ b/user-manual.html @@ -540,7 +540,7 @@ $ $ git diff --theirs file.txt    # same as the above.

    The git-log(1) and gitk[1] commands also provide special help for merges:

    $ git log --merge
    $ gitk --merge

    These will display all commits which exist only on HEAD or on -MERGE_HEAD, and which touch an unmerged file.

    You may also use gitlink:git-mergetool, which lets you merge the +MERGE_HEAD, and which touch an unmerged file.

    You may also use git-mergetool(1), which lets you merge the unmerged files using external tools such as emacs or kdiff3.

    Each time you resolve the conflicts in a file and update the index:

    $ git add file.txt

    the different stages of that file will be "collapsed", after which git-diff will (by default) no longer show diffs for that file.

    Undoing a merge

    If you get stuck and decide to just give up and throw the whole mess away, you can always return to the pre-merge state with

    $ git reset --hard HEAD

    Or, if you've already commited the merge that you want to throw away,

    $ git reset --hard ORIG_HEAD

    However, this last command can be dangerous in some cases—never diff --git a/user-manual.txt b/user-manual.txt index a7abeaa1d..8d6688633 100644 --- a/user-manual.txt +++ b/user-manual.txt @@ -1357,7 +1357,7 @@ $ gitk --merge These will display all commits which exist only on HEAD or on MERGE_HEAD, and which touch an unmerged file. -You may also use gitlink:git-mergetool, which lets you merge the +You may also use gitlink:git-mergetool[1], which lets you merge the unmerged files using external tools such as emacs or kdiff3. Each time you resolve the conflicts in a file and update the index: -- 2.26.2