index
:
tgif.git
2.36
Terin's Improved Git Fork
terinjokes@gmail.com
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
Documentation
/
git-merge.txt
Age
Commit message (
Expand
)
Author
Files
Lines
2007-09-25
Fix spelling of overridden in documentation
Shawn Bohrer
1
-1
/
+1
2007-08-01
Try to be consistent with capitalization in the documentation
Steve Hoelzer
1
-5
/
+5
2007-07-12
Update git-merge documentation.
Jakub Narebski
1
-0
/
+15
2007-06-07
War on whitespace
Junio C Hamano
1
-1
/
+1
2007-05-24
Add a configuration option to control diffstat after merge
Alex Riesen
1
-1
/
+1
2007-02-17
Convert update-index references in docs to add.
Shawn O. Pearce
1
-1
/
+1
2007-02-12
git merge documentation: -m is optional
Matthias Lederhofer
1
-1
/
+1
2007-01-18
Documentation: sync git.txt command list and manual page title
Junio C Hamano
1
-1
/
+1
2006-12-28
Use GIT_REFLOG_ACTION environment variable instead.
Shawn O. Pearce
1
-6
/
+0
2006-11-21
git-merge: make it usable as the first class UI
Junio C Hamano
1
-5
/
+13
2006-07-09
Assorted typo fixes
Pavel Roskin
1
-1
/
+1
2005-12-16
Examples of resetting.
Junio C Hamano
1
-0
/
+5
2005-12-02
git-merge documentation: conflicting merge leaves higher stages in index
Junio C Hamano
1
-4
/
+6
2005-11-28
Documentation: Describe merge operation a bit better.
Junio C Hamano
1
-0
/
+95
2005-11-06
Refactored merge options into separate merge-options.txt.
Jon Loeliger
1
-1
/
+1
2005-11-06
Refactor merge strategies into separate includable file.
Jon Loeliger
1
-0
/
+2
2005-11-05
Documentation: git-fetch/pull updates.
Junio C Hamano
1
-1
/
+1
2005-11-04
Documentation: -merge and -pull: describe merge strategies.
Junio C Hamano
1
-9
/
+2
2005-11-01
Documentation for git-fmt-merge-msg
Petr Baudis
1
-0
/
+10
2005-10-10
Remove the version tags from the manpages
Junio C Hamano
1
-1
/
+0
2005-09-20
[PATCH] Documentation: Update all files to use the new gitlink: macro
Sergey Vlasov
1
-1
/
+1
2005-09-10
'git-merge': Documentation.
Junio C Hamano
1
-0
/
+52