index
:
git
main
maint
master
next
seen
todo
Git: sistema de control de versiones
mirror
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
Documentation
/
git-merge.txt
Age
Commit message (
Expand
)
Author
2007-02-17
Convert update-index references in docs to add.
Shawn O. Pearce
2007-02-13
git merge documentation: -m is optional
Matthias Lederhofer
2007-01-18
Documentation: sync git.txt command list and manual page title
Junio C Hamano
2006-12-28
Use GIT_REFLOG_ACTION environment variable instead.
Shawn O. Pearce
2006-11-22
git-merge: make it usable as the first class UI
Junio C Hamano
2006-07-09
Assorted typo fixes
Pavel Roskin
2005-12-17
Examples of resetting.
Junio C Hamano
2005-12-02
git-merge documentation: conflicting merge leaves higher stages in index
Junio C Hamano
2005-11-29
Documentation: Describe merge operation a bit better.
Junio C Hamano
2005-11-07
Refactored merge options into separate merge-options.txt.
Jon Loeliger
2005-11-06
Refactor merge strategies into separate includable file.
Jon Loeliger
2005-11-05
Documentation: git-fetch/pull updates.
Junio C Hamano
2005-11-04
Documentation: -merge and -pull: describe merge strategies.
Junio C Hamano
2005-11-01
Documentation for git-fmt-merge-msg
Petr Baudis
2005-10-10
Remove the version tags from the manpages
Junio C Hamano
2005-09-20
[PATCH] Documentation: Update all files to use the new gitlink: macro
Sergey Vlasov
2005-09-11
'git-merge': Documentation.
Junio C Hamano
