From 043628ece853c662b2290c92ae0920922e80f131 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 24 Aug 2008 03:34:11 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.6.0-106-gd6096 --- git-checkout.html | 15 +++++++++++---- git-checkout.txt | 13 ++++++++++--- git-merge.html | 40 +++++++++++++++++++++++++++++++++------- git-merge.txt | 24 ++++++++++++++++++------ 4 files changed, 72 insertions(+), 20 deletions(-) diff --git a/git-checkout.html b/git-checkout.html index afa2b48a9..68dcbc191 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -395,9 +395,16 @@ working tree.

given. Set it to always if you want this behavior when the start-point is either a local or remote branch.

-

If no -b option was given, a name will be made up for you, by stripping -the part up to the first slash of the tracked branch. For example, if you -called git checkout --track origin/next, the branch name will be next.

+

If no -b option was given, the name of the new branch will be +derived from the remote branch, by attempting to guess the name +of the branch on remote system. If "remotes/" or "refs/remotes/" +are prefixed, it is stripped away, and then the part up to the +next slash (which would be the nickname of the remote) is removed. +This would tell us to use "hack" as the local branch when branching +off of "origin/hack" (or "remotes/origin/hack", or even +"refs/remotes/origin/hack"). If the given name has no slash, or the above +guessing results in an empty name, the guessing is aborted. You can +exlicitly give a name with -b in such a case.

--no-track @@ -596,7 +603,7 @@ $ git add frotz diff --git a/git-checkout.txt b/git-checkout.txt index 43d450254..be54a0299 100644 --- a/git-checkout.txt +++ b/git-checkout.txt @@ -64,9 +64,16 @@ OPTIONS given. Set it to `always` if you want this behavior when the start-point is either a local or remote branch. + -If no '-b' option was given, a name will be made up for you, by stripping -the part up to the first slash of the tracked branch. For example, if you -called 'git checkout --track origin/next', the branch name will be 'next'. +If no '-b' option was given, the name of the new branch will be +derived from the remote branch, by attempting to guess the name +of the branch on remote system. If "remotes/" or "refs/remotes/" +are prefixed, it is stripped away, and then the part up to the +next slash (which would be the nickname of the remote) is removed. +This would tell us to use "hack" as the local branch when branching +off of "origin/hack" (or "remotes/origin/hack", or even +"refs/remotes/origin/hack"). If the given name has no slash, or the above +guessing results in an empty name, the guessing is aborted. You can +exlicitly give a name with '-b' in such a case. --no-track:: Ignore the branch.autosetupmerge configuration variable. diff --git a/git-merge.html b/git-merge.html index a4aceea49..3ad4e2866 100644 --- a/git-merge.html +++ b/git-merge.html @@ -768,12 +768,38 @@ Decide not to merge. The only clean-up you need are to reset

  • -Resolve the conflicts. git diff would report only the - conflicting paths because of the above 2. and 3. - Edit the working tree files into a desirable shape - (git mergetool can ease this task), git-add or git-rm - them, to make the index file contain what the merge result - should be, and run git-commit to commit the result. +Resolve the conflicts. Git will mark the conflicts in + the working tree. Edit the files into shape and + git-add to the index. git-commit to seal the deal. +

    +
    • + +

    You can work through the conflict with a number of tools:

    +
      +
    • +

      +Use a mergetool. git mergetool to launch a graphical + mergetool which will work you through the merge. +

      +
      • +
    • +

      +Look at the diffs. git diff will show a three-way diff, + highlighting changes from both the HEAD and remote versions. +

      +
      • +
    • +

      +Look at the diffs on their own. git log --merge -p <path> + will show diffs first for the HEAD version and then the + remote version. +

      +
      • +
    • +

      +Look at the originals. git show :1:filename shows the + common ancestor, git show :2:filename shows the HEAD + version and git show :3:filename shows the remote version.

    @@ -801,7 +827,7 @@ Resolve the conflicts. git diff would report only the diff --git a/git-merge.txt b/git-merge.txt index 17a15acb0..685e1fed5 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -126,13 +126,25 @@ After seeing a conflict, you can do two things: up working tree changes made by 2. and 3.; 'git-reset --hard' can be used for this. - * Resolve the conflicts. `git diff` would report only the - conflicting paths because of the above 2. and 3. - Edit the working tree files into a desirable shape - ('git mergetool' can ease this task), 'git-add' or 'git-rm' - them, to make the index file contain what the merge result - should be, and run 'git-commit' to commit the result. + * Resolve the conflicts. Git will mark the conflicts in + the working tree. Edit the files into shape and + 'git-add' to the index. 'git-commit' to seal the deal. +You can work through the conflict with a number of tools: + + * Use a mergetool. 'git mergetool' to launch a graphical + mergetool which will work you through the merge. + + * Look at the diffs. 'git diff' will show a three-way diff, + highlighting changes from both the HEAD and remote versions. + + * Look at the diffs on their own. 'git log --merge -p ' + will show diffs first for the HEAD version and then the + remote version. + + * Look at the originals. 'git show :1:filename' shows the + common ancestor, 'git show :2:filename' shows the HEAD + version and 'git show :3:filename' shows the remote version. SEE ALSO -------- -- 2.26.2