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
/
contrib
/
examples
/
git-merge.sh
Age
Commit message (
Expand
)
Author
2018-03-26
Remove contrib/examples/*
Ævar Arnfjörð Bjarmason
2017-08-23
treewide: correct several "up-to-date" to "up to date"
Martin Ågren
2015-12-27
contrib/examples/git-merge.sh: use the $( ... ) construct for command substit...
Elia Pinto
2014-06-09
contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>"
Elia Pinto
2014-04-17
git-merge.sh: use the $( ... ) construct for command substitution
Elia Pinto
2013-09-04
use 'commit-ish' instead of 'committish'
Richard Hansen
2010-08-18
merge script: learn --[no-]rerere-autoupdate
Jonathan Nieder
2010-08-18
merge script: notice @{-1} shorthand
Jonathan Nieder
2010-08-18
merge script: handle --no-ff --no-commit correctly
Jonathan Nieder
2010-08-18
merge script: --ff-only to disallow true merge
Jonathan Nieder
2010-08-18
merge script: handle many-way octopus
Jonathan Nieder
2010-08-18
merge script: handle -m --log correctly
Jonathan Nieder
2010-08-18
merge script: forbid merge -s index
Jonathan Nieder
2010-08-18
merge script: allow custom strategies
Jonathan Nieder
2010-08-18
merge script: merge -X<option>
Jonathan Nieder
2010-08-18
merge script: improve log message subject
Jonathan Nieder
2010-08-18
merge script: refuse to merge during merge
Jonathan Nieder
2010-08-18
merge script: tweak unmerged files message to match builtin
Jonathan Nieder
2010-08-18
merge script: --squash, --ff from unborn branch are errors
Jonathan Nieder
2010-01-18
git merge -X<option>
Avery Pennarun
2009-10-25
Use 'fast-forward' all over the place
Felipe Contreras
2008-07-17
Merge branch 'sb/dashless'
Junio C Hamano
2008-07-08
Build in merge
Miklos Vajna