.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-BRANCH" "1" "07/19/2007" "Git 1.5.3.rc2.19.gc4fba" "Git Manual"
+.TH "GIT\-BRANCH" "1" "08/02/2007" "Git 1.5.3.rc3.120.g68d422" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.fi
.sp
-\fB1. \fRdelete remote\-tracking branches "todo", "html", "man"
+\fB1. \fRDelete remote\-tracking branches "todo", "html", "man"
.br
-\fB2. \fRdelete "test" branch even if the "master" branch does not have all commits from test branch.
+\fB2. \fRDelete "test" branch even if the "master" branch does not have all commits from test branch.
.br
.SH "NOTES"
If you are creating a branch that you want to immediately checkout, it's easier to use the git checkout command with its \-b option to create a branch and check it out with a single command.
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-DIFF" "1" "07/30/2007" "Git 1.5.3.rc3.91.g5c75" "Git Manual"
+.TH "GIT\-DIFF" "1" "08/02/2007" "Git 1.5.3.rc3.120.g68d422" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.fi
.sp
-\fB1. \fRchanges in the working tree not yet staged for the next commit.
+\fB1. \fRChanges in the working tree not yet staged for the next commit.
.br
-\fB2. \fRchanges between the index and your last commit; what you would be committing if you run "git commit" without "\-a" option.
+\fB2. \fRChanges between the index and your last commit; what you would be committing if you run "git commit" without "\-a" option.
.br
-\fB3. \fRchanges in the working tree since your last commit; what you would be committing if you run "git commit \-a"
+\fB3. \fRChanges in the working tree since your last commit; what you would be committing if you run "git commit \-a"
.br
.TP
Comparing with arbitrary commits
.fi
.sp
-\fB1. \fRinstead of using the tip of the current branch, compare with the tip of "test" branch.
+\fB1. \fRInstead of using the tip of the current branch, compare with the tip of "test" branch.
.br
-\fB2. \fRinstead of comparing with the tip of "test" branch, compare with the tip of the current branch, but limit the comparison to the file "test".
+\fB2. \fRInstead of comparing with the tip of "test" branch, compare with the tip of the current branch, but limit the comparison to the file "test".
.br
-\fB3. \fRcompare the version before the last commit and the last commit.
+\fB3. \fRCompare the version before the last commit and the last commit.
.br
.TP
Limiting the diff output
.fi
.sp
-\fB1. \fRshow only modification, rename and copy, but not addition nor deletion.
+\fB1. \fRShow only modification, rename and copy, but not addition nor deletion.
.br
-\fB2. \fRshow only names and the nature of change, but not actual diff output.
+\fB2. \fRShow only names and the nature of change, but not actual diff output.
.br
-\fB3. \fRlimit diff output to named subtrees.
+\fB3. \fRLimit diff output to named subtrees.
.br
.TP
Munging the diff output
.fi
.sp
-\fB1. \fRspend extra cycles to find renames, copies and complete rewrites (very expensive).
+\fB1. \fRSpend extra cycles to find renames, copies and complete rewrites (very expensive).
.br
-\fB2. \fRoutput diff in reverse.
+\fB2. \fROutput diff in reverse.
.br
.SH "AUTHOR"
Written by Linus Torvalds <torvalds@osdl.org>
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-MERGE" "1" "07/19/2007" "Git 1.5.3.rc1.4.gaf83" "Git Manual"
+.TH "GIT\-MERGE" "1" "08/02/2007" "Git 1.5.3.rc3.120.g68d422" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
When things cleanly merge, these things happen:
.TP 3
1.
-the results are updated both in the index file and in your working tree,
+The results are updated both in the index file and in your working tree;
.TP
2.
-index file is written out as a tree,
+Index file is written out as a tree;
.TP
3.
-the tree gets committed, and
+The tree gets committed; and
.TP
4.
-the HEAD pointer gets advanced.
+The HEAD pointer gets advanced.
Because of 2., we require that the original state of the index file to match exactly the current HEAD commit; otherwise we will write out your local changes already registered in your index file along with the merge result, which is not good. Because 1. involves only the paths different between your branch and the remote branch you are pulling from during the merge (which is typically a fraction of the whole tree), you can have local modifications in your working tree as long as they do not overlap with what the merge updates.
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-RESET" "1" "07/19/2007" "Git 1.5.3.rc2.19.gc4fba" "Git Manual"
+.TH "GIT\-RESET" "1" "08/02/2007" "Git 1.5.3.rc3.120.g68d422" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.sp
\fB1. \fRThis is most often done when you remembered what you just committed is incomplete, or you misspelled your commit message, or both. Leaves working tree as it was before "reset".
.br
-\fB2. \fRmake corrections to working tree files.
+\fB2. \fRMake corrections to working tree files.
.br
\fB3. \fR"reset" copies the old head to .git/ORIG_HEAD; redo the commit by starting with its log message. If you do not need to edit the message further, you can give \-C option instead.
.fi
.sp
-\fB1. \fRyou 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.
+\fB1. \fRYou 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.
.br
-\fB2. \fRsomebody asks you to pull, and the changes sounds worthy of merging.
+\fB2. \fRSomebody asks you to pull, and the changes sounds worthy of merging.
.br
-\fB3. \fRhowever, 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.
+\fB3. \fRHowever, 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.
.br
-\fB4. \fRthen you can pull and merge, leaving frotz.c and filfre.c changes still in the working tree.
+\fB4. \fRThen you can pull and merge, leaving frotz.c and filfre.c changes still in the working tree.
.br
.TP
Undo a merge or pull
.fi
.sp
-\fB1. \fRtry to update from the upstream resulted in a lot of conflicts; you were not ready to spend a lot of time merging right now, so you decide to do that later.
+\fB1. \fRTry to update from the upstream resulted in a lot of conflicts; you were not ready to spend a lot of time merging right now, so you decide to do that later.
.br
\fB2. \fR"pull" has not made merge commit, so "git reset \-\-hard" which is a synonym for "git reset \-\-hard HEAD" clears the mess from the index file and the working tree.
.br
-\fB3. \fRmerge a topic branch into the current branch, which resulted in a fast forward.
+\fB3. \fRMerge a topic branch into the current branch, which resulted in a fast forward.
.br
-\fB4. \fRbut you decided that the topic branch is not ready for public consumption yet. "pull" or "merge" always leaves the original tip of the current branch in ORIG_HEAD, so resetting hard to it brings your index file and the working tree back to that state, and resets the tip of the branch to that commit.
+\fB4. \fRBut you decided that the topic branch is not ready for public consumption yet. "pull" or "merge" always leaves the original tip of the current branch in ORIG_HEAD, so resetting hard to it brings your index file and the working tree back to that state, and resets the tip of the branch to that commit.
.br
.TP
Interrupted workflow
projects / git.git / commitdiff