summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
AgeCommit message (Expand)AuthorFilesLines
2007-02-17Convert update-index references in docs to add.Libravatar Shawn O. Pearce1-1/+1
2007-02-12git merge documentation: -m is optionalLibravatar Matthias Lederhofer1-1/+1
2007-01-18Documentation: sync git.txt command list and manual page titleLibravatar Junio C Hamano1-1/+1
2006-12-28Use GIT_REFLOG_ACTION environment variable instead.Libravatar Shawn O. Pearce1-6/+0
2006-11-21git-merge: make it usable as the first class UILibravatar Junio C Hamano1-5/+13
2006-07-09Assorted typo fixesLibravatar Pavel Roskin1-1/+1
2005-12-16Examples of resetting.Libravatar Junio C Hamano1-0/+5
2005-12-02git-merge documentation: conflicting merge leaves higher stages in indexLibravatar Junio C Hamano1-4/+6
2005-11-28Documentation: Describe merge operation a bit better.Libravatar Junio C Hamano1-0/+95
2005-11-06Refactored merge options into separate merge-options.txt.Libravatar Jon Loeliger1-1/+1
2005-11-06Refactor merge strategies into separate includable file.Libravatar Jon Loeliger1-0/+2
2005-11-05Documentation: git-fetch/pull updates.Libravatar Junio C Hamano1-1/+1
2005-11-04Documentation: -merge and -pull: describe merge strategies.Libravatar Junio C Hamano1-9/+2
2005-11-01Documentation for git-fmt-merge-msgLibravatar Petr Baudis1-0/+10
2005-10-10Remove the version tags from the manpagesLibravatar Junio C Hamano1-1/+0
2005-09-20[PATCH] Documentation: Update all files to use the new gitlink: macroLibravatar Sergey Vlasov1-1/+1
2005-09-10'git-merge': Documentation.Libravatar Junio C Hamano1-0/+52