summaryrefslogtreecommitdiff
path: root/t/t7600-merge.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'vv/merge-squash-with-explicit-commit'Junio C Hamano2019-06-171-0/+6
|\
| * merge: refuse --commit with --squashVishal Verma2019-05-281-0/+6
* | Merge branch 'jk/help-unknown-ref-fix'Junio C Hamano2019-06-131-0/+20
|\ \
| * | help_unknown_ref(): check for refname ambiguityJeff King2019-05-151-0/+6
| * | help_unknown_ref(): duplicate collected refnamesJeff King2019-05-151-0/+14
| |/
* | Merge branch 'nd/merge-quit'Junio C Hamano2019-06-131-0/+26
|\ \
| * | merge: add --quitNguyễn Thái Ngọc Duy2019-05-191-0/+26
| |/
* | merge: add scissors line on merge conflictDenton Liu2019-04-181-0/+46
* | t7600: clean up styleDenton Liu2019-04-181-14/+13
|/
* tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'SZEDER Gábor2018-08-211-6/+3
* merge: allow fast-forward when merging a tracked tagjc/allow-ff-merging-kept-tagsJunio C Hamano2018-02-161-1/+37
* tests: fix diff order arguments in test_cmpsb/test-cmp-expect-actualStefan Beller2017-10-071-3/+3
* merge: save merge state earliermg/killed-mergeMichael J Gruber2017-08-231-0/+15
* merge: ensure '--abort' option takes no argumentsChris Packham2016-12-141-0/+2
* merge: add '--continue' option as a synonym for 'git commit'Chris Packham2016-12-141-0/+9
* Merge branch 'jv/merge-nothing-into-void'Junio C Hamano2016-04-061-0/+10
|\
| * merge: fix NULL pointer dereference when merging nothing into voidjv/merge-nothing-into-voidJunio C Hamano2016-03-231-0/+10
* | Merge branch 'ss/commit-squash-msg'Junio C Hamano2016-04-061-0/+28
|\ \ | |/ |/|
| * commit: do not lose SQUASH_MSG contentsss/commit-squash-msgSven Strickroth2016-03-211-0/+28
* | Merge branch 'jk/merge-file-exit-code'Junio C Hamano2015-10-301-0/+33
|\ \ | |/ |/|
| * merge-file: clamp exit code to maximum 127jk/merge-file-exit-codeJeff King2015-10-291-0/+33
* | t: fix trivial &&-chain breakageJeff King2015-03-201-1/+1
|/
* git-show: fix 'git show -s' to not add extra terminator after merge commitmk/show-s-no-extra-blank-line-for-mergesMax Kirillov2014-05-151-6/+5
* t7600: fix typo in test titlemv/merge-ff-tristateJunio C Hamano2013-07-231-1/+1
* merge: handle --ff/--no-ff/--ff-only as a tri-state optionMiklos Vajna2013-07-021-3/+9
* Merge branch 'vl/typofix'Junio C Hamano2013-06-261-1/+1
|\
| * random typofixes (committed missing a 't', successful missing an 's')Veres Lajos2013-06-191-1/+1
* | t7600: use test_config to set/unset git config variablesYann Droneaud2013-03-251-34/+26
|/
* Fix tests under GETTEXT_POISON on parseoptJiang Xin2012-08-271-1/+1
* merge: do not launch an editor on "--no-edit $tag"jn/merge-no-edit-fixJunio C Hamano2012-02-091-0/+12
* merge: do not create a signed tag merge under --ff-only optionjc/merge-ff-only-stronger-than-signed-mergeJunio C Hamano2012-02-051-0/+13
* merge: record tag objects without peeling in MERGE_HEADJunio C Hamano2011-11-081-1/+5
* merge: notice local merging of tags and keep it unwrappedJunio C Hamano2011-11-071-3/+3
* Teach merge the '[-e|--edit]' optionJay Soffian2011-10-121-0/+23
* Merge branch 'mg/merge-ff-config'Junio C Hamano2011-05-161-6/+58
|\
| * tests: check git does not barf on merge.ff values for future versions of gitJonathan Nieder2011-05-061-2/+14
| * merge: introduce merge.ff configuration variableJunio C Hamano2011-05-061-2/+41
| * Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-configJunio C Hamano2011-05-061-0/+33
| |\
* | \ Merge branch 'jc/maint-branch-mergeoptions'Junio C Hamano2011-05-111-0/+32
|\ \ \ | | |/ | |/|
| * | merge: make branch.<name>.mergeoptions correctly override merge.<option>Junio C Hamano2011-05-061-0/+32
* | | Merge branch 'jn/maint-test-merge-verify-parents'Junio C Hamano2011-05-111-74/+73
|\ \ \
| * | | tests: teach verify_parents to check for extra parentsJonathan Nieder2011-05-061-0/+1
| * | | tests: eliminate unnecessary setup test assertionsJonathan Nieder2011-05-061-74/+72
| | |/ | |/|
* | | i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811Junio C Hamano2011-04-141-2/+2
|/ /
* | i18n: git-merge "Wonderful" messageÆvar Arnfjörð Bjarmason2011-03-091-1/+1
* | merge -h: show usage even with corrupt indexNguyễn Thái Ngọc Duy2010-10-221-0/+11
* | t7600 (merge): test merge from branch yet to be bornJonathan Nieder2010-08-181-0/+21
* | t7600 (merge): check reflog entryJonathan Nieder2010-08-181-1/+7
* | t7600 (merge): do not launch gitk for --debugJonathan Nieder2010-08-181-29/+29
* | t7600 (merge): modernize styleJonathan Nieder2010-08-181-187/+101
View Lorry Controller Status