path: root/Documentation/git-merge.txt
AgeCommit message (Collapse)Author
2005-12-17Examples of resetting.Junio C Hamano
Morten Welinder says examples of resetting is really about recovering from botched commit/pulls. I agree that pointers from commands that cause a reset to be needed in the first place would be very helpful. Also reset examples did not mention "pull/merge" cases. Signed-off-by: Junio C Hamano <>
2005-12-02git-merge documentation: conflicting merge leaves higher stages in indexJunio C Hamano
This hopefully concludes the latest updates that changes the behaviour of the merge on an unsuccessful automerge. Instead of collapsing the conflicted path in the index to show HEAD, we leave it unmerged, now that diff-files can compare working tree files with higher stages. Signed-off-by: Junio C Hamano <>
2005-11-29Documentation: Describe merge operation a bit better.Junio C Hamano
In git-merge documentation, add a section to describe what happens to the index and working tree during merge, and what their cleanliness requirements are before the merge. Signed-off-by: Junio C Hamano <>
2005-11-07Refactored merge options into separate merge-options.txt.Jon Loeliger
Refactored fetch options into separate fetch-options.txt. Made git-merge use merge-options. Made git-fetch use fetch-options. Made git-pull use merge-options and fetch-options. Added --help option to git-pull and git-format-patch scripts. Rewrote Documentation/Makefile to dynamically determine include dependencies. Signed-off-by: Jon Loeliger <> Signed-off-by: Junio C Hamano <>
2005-11-06Refactor merge strategies into separate includable file.Jon Loeliger
Signed-off-by: Jon Loeliger <> Signed-off-by: Junio C Hamano <>
2005-11-05Documentation: git-fetch/pull updates.Junio C Hamano
We do not accept multiple <refspecs> on one Pull:/Push: line right now (we could lift this tentative workaround for the broken refnames), but we have always accepted multiple such lines, so use that form in the examples and discussion. Also explicitly mention that Octopus is made only with an explicit command line request and never from Pull: lines. Add a couple of cross references. Signed-off-by: Junio C Hamano <>
2005-11-04Documentation: -merge and -pull: describe merge strategies.Junio C Hamano
... and give a couple of examples of running 'git pull' against local repository. Signed-off-by: Junio C Hamano <>
2005-11-01Documentation for git-fmt-merge-msgPetr Baudis
Simple description. It appears to be mostly internal command, but hey, it is (it seems) the only undocumented one, so let's fix it up... Also add a note about it to git-merge documentation. Signed-off-by: Petr Baudis <> Signed-off-by: Junio C Hamano <>
2005-10-10Remove the version tags from the manpagesJunio C Hamano
Signed-off-by: Christian Meder <> Signed-off-by: Junio C Hamano <>
2005-09-20[PATCH] Documentation: Update all files to use the new gitlink: macroSergey Vlasov
The replacement was performed automatically by these commands: perl -pi -e 's/link:(git.+)\.html\[\1\]/gitlink:$1\[1\]/g' \ README Documentation/*.txt perl -pi -e 's/link:git\.html\[git\]/gitlink:git\[7\]/g' \ README Documentation/*.txt Signed-off-by: Sergey Vlasov <> Signed-off-by: Junio C Hamano <>
2005-09-11'git-merge': Documentation.Junio C Hamano
... and add link from git.txt, as usual. Signed-off-by: Junio C Hamano <>