index
:
org/kernel/git.git
master
forked from git/git
git
about
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
Documentation
/
git-merge.txt
Commit message (
Expand
)
Author
Age
...
|
*
git-merge: document but discourage the historical syntax
Junio C Hamano
2007-10-30
*
|
Merge branch 'lh/merge'
Junio C Hamano
2007-10-03
|
\
\
|
|
/
|
/
|
|
*
git-merge: add support for branch.<name>.mergeoptions
Lars Hjemli
2007-09-23
*
|
Fix spelling of overridden in documentation
Shawn Bohrer
2007-09-25
|
/
*
Try to be consistent with capitalization in the documentation
Steve Hoelzer
2007-08-01
*
Update git-merge documentation.
Jakub Narebski
2007-07-12
*
War on whitespace
Junio C Hamano
2007-06-07
*
Add a configuration option to control diffstat after merge
Alex Riesen
2007-05-24
*
Convert update-index references in docs to add.
Shawn O. Pearce
2007-02-17
*
git merge documentation: -m is optional
Matthias Lederhofer
2007-02-12
*
Documentation: sync git.txt command list and manual page title
Junio C Hamano
2007-01-18
*
Use GIT_REFLOG_ACTION environment variable instead.
Shawn O. Pearce
2006-12-28
*
git-merge: make it usable as the first class UI
Junio C Hamano
2006-11-21
*
Assorted typo fixes
Pavel Roskin
2006-07-09
*
Examples of resetting.
Junio C Hamano
2005-12-16
*
git-merge documentation: conflicting merge leaves higher stages in index
Junio C Hamano
2005-12-02
*
Documentation: Describe merge operation a bit better.
Junio C Hamano
2005-11-28
*
Refactored merge options into separate merge-options.txt.
Jon Loeliger
2005-11-06
*
Refactor merge strategies into separate includable file.
Jon Loeliger
2005-11-06
*
Documentation: git-fetch/pull updates.
Junio C Hamano
2005-11-05
*
Documentation: -merge and -pull: describe merge strategies.
Junio C Hamano
2005-11-04
*
Documentation for git-fmt-merge-msg
Petr Baudis
2005-11-01
*
Remove the version tags from the manpages
Junio C Hamano
2005-10-10
*
[PATCH] Documentation: Update all files to use the new gitlink: macro
Sergey Vlasov
2005-09-20
*
'git-merge': Documentation.
Junio C Hamano
2005-09-10
[prev]