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
/
t
/
t7600-merge.sh
Age
Commit message (
Expand
)
Author
2019-07-25
Merge branch 'vv/merge-squash-with-explicit-commit' into maint
Junio C Hamano
2019-05-28
merge: refuse --commit with --squash
Vishal Verma
2019-04-18
merge: add scissors line on merge conflict
Denton Liu
2019-04-18
t7600: clean up style
Denton Liu
2018-08-21
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
SZEDER Gábor
2018-02-16
merge: allow fast-forward when merging a tracked tag
Junio C Hamano
2017-10-07
tests: fix diff order arguments in test_cmp
Stefan Beller
2017-08-23
merge: save merge state earlier
Michael J Gruber
2016-12-14
merge: ensure '--abort' option takes no arguments
Chris Packham
2016-12-14
merge: add '--continue' option as a synonym for 'git commit'
Chris Packham
2016-04-06
Merge branch 'jv/merge-nothing-into-void'
Junio C Hamano
2016-04-06
Merge branch 'ss/commit-squash-msg'
Junio C Hamano
2016-03-23
merge: fix NULL pointer dereference when merging nothing into void
Junio C Hamano
2016-03-21
commit: do not lose SQUASH_MSG contents
Sven Strickroth
2015-10-30
Merge branch 'jk/merge-file-exit-code'
Junio C Hamano
2015-10-29
merge-file: clamp exit code to maximum 127
Jeff King
2015-03-20
t: fix trivial &&-chain breakage
Jeff King
2014-05-15
git-show: fix 'git show -s' to not add extra terminator after merge commit
Max Kirillov
2013-07-23
t7600: fix typo in test title
Junio C Hamano
2013-07-02
merge: handle --ff/--no-ff/--ff-only as a tri-state option
Miklos Vajna
2013-06-26
Merge branch 'vl/typofix'
Junio C Hamano
2013-06-19
random typofixes (committed missing a 't', successful missing an 's')
Veres Lajos
2013-03-25
t7600: use test_config to set/unset git config variables
Yann Droneaud
2012-08-27
Fix tests under GETTEXT_POISON on parseopt
Jiang Xin
2012-02-09
merge: do not launch an editor on "--no-edit $tag"
Junio C Hamano
2012-02-06
merge: do not create a signed tag merge under --ff-only option
Junio C Hamano
2011-11-08
merge: record tag objects without peeling in MERGE_HEAD
Junio C Hamano
2011-11-07
merge: notice local merging of tags and keep it unwrapped
Junio C Hamano
2011-10-12
Teach merge the '[-e|--edit]' option
Jay Soffian
2011-05-16
Merge branch 'mg/merge-ff-config'
Junio C Hamano
2011-05-11
Merge branch 'jc/maint-branch-mergeoptions'
Junio C Hamano
2011-05-11
Merge branch 'jn/maint-test-merge-verify-parents'
Junio C Hamano
2011-05-06
tests: check git does not barf on merge.ff values for future versions of git
Jonathan Nieder
2011-05-06
tests: teach verify_parents to check for extra parents
Jonathan Nieder
2011-05-06
merge: introduce merge.ff configuration variable
Junio C Hamano
2011-05-06
Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config
Junio C Hamano
2011-05-06
merge: make branch.<name>.mergeoptions correctly override merge.<option>
Junio C Hamano
2011-05-06
tests: eliminate unnecessary setup test assertions
Jonathan Nieder
2011-04-14
i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811
Junio C Hamano
2011-03-10
i18n: git-merge "Wonderful" message
Ævar Arnfjörð Bjarmason
2010-10-22
merge -h: show usage even with corrupt index
Nguyễn Thái Ngọc Duy
2010-08-18
t7600 (merge): test merge from branch yet to be born
Jonathan Nieder
2010-08-18
t7600 (merge): check reflog entry
Jonathan Nieder
2010-08-18
t7600 (merge): do not launch gitk for --debug
Jonathan Nieder
2010-08-18
t7600 (merge): modernize style
Jonathan Nieder
2010-08-18
merge: do not mistake (ancestor of) tag for branch
Jonathan Nieder
2010-04-07
war on "sleep" in tests
Junio C Hamano
2009-10-30
Teach 'git merge' and 'git pull' the option --ff-only
Björn Gustavsson
2008-10-19
Merge branch 'mv/merge-noff'
Junio C Hamano
2008-10-17
Merge branch 'maint'
Junio C Hamano
[next]