Age | Commit message (Expand) | Author | Files | Lines |
2021-07-23 | merge: apply autostash if merge strategy fails | Philippe Blain | 1 | -0/+8 |
2021-07-23 | merge: apply autostash if fast-forward fails | Philippe Blain | 1 | -0/+11 |
2021-02-10 | tests: remove most uses of test_i18ncmp | Ævar Arnfjörð Bjarmason | 1 | -2/+2 |
2020-11-19 | t7[5-9]*: adjust the references to the default branch name "main" | Johannes Schindelin | 1 | -23/+23 |
2020-11-19 | tests: mark tests relying on the current default for `init.defaultBranch` | Johannes Schindelin | 1 | -0/+3 |
2020-08-06 | t: don't spuriously close and reopen quotes | Martin Ågren | 1 | -3/+3 |
2020-07-30 | Revert "fmt-merge-msg: stop treating `master` specially" | Junio C Hamano | 1 | -7/+7 |
2020-06-23 | fmt-merge-msg: stop treating `master` specially | Johannes Schindelin | 1 | -7/+7 |
2020-04-10 | merge: teach --autostash option | Denton Liu | 1 | -0/+132 |
2020-03-24 | t7600: use test_write_lines() | Denton Liu | 1 | -11/+11 |
2019-06-17 | Merge branch 'vv/merge-squash-with-explicit-commit' | Junio C Hamano | 1 | -0/+6 |
2019-06-13 | Merge branch 'jk/help-unknown-ref-fix' | Junio C Hamano | 1 | -0/+20 |
2019-06-13 | Merge branch 'nd/merge-quit' | Junio C Hamano | 1 | -0/+26 |
2019-05-28 | merge: refuse --commit with --squash | Vishal Verma | 1 | -0/+6 |
2019-05-19 | merge: add --quit | Nguyễn Thái Ngọc Duy | 1 | -0/+26 |
2019-05-15 | help_unknown_ref(): check for refname ambiguity | Jeff King | 1 | -0/+6 |
2019-05-15 | help_unknown_ref(): duplicate collected refnames | Jeff King | 1 | -0/+14 |
2019-04-18 | merge: add scissors line on merge conflict | Denton Liu | 1 | -0/+46 |
2019-04-18 | t7600: clean up style | Denton Liu | 1 | -14/+13 |
2018-08-21 | tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>' | SZEDER Gábor | 1 | -6/+3 |
2018-02-16 | merge: allow fast-forward when merging a tracked tag | Junio C Hamano | 1 | -1/+37 |
2017-10-07 | tests: fix diff order arguments in test_cmp | Stefan Beller | 1 | -3/+3 |
2017-08-23 | merge: save merge state earlier | Michael J Gruber | 1 | -0/+15 |
2016-12-14 | merge: ensure '--abort' option takes no arguments | Chris Packham | 1 | -0/+2 |
2016-12-14 | merge: add '--continue' option as a synonym for 'git commit' | Chris Packham | 1 | -0/+9 |
2016-04-06 | Merge branch 'jv/merge-nothing-into-void' | Junio C Hamano | 1 | -0/+10 |
2016-04-06 | Merge branch 'ss/commit-squash-msg' | Junio C Hamano | 1 | -0/+28 |
2016-03-23 | merge: fix NULL pointer dereference when merging nothing into void | Junio C Hamano | 1 | -0/+10 |
2016-03-21 | commit: do not lose SQUASH_MSG contents | Sven Strickroth | 1 | -0/+28 |
2015-10-30 | Merge branch 'jk/merge-file-exit-code' | Junio C Hamano | 1 | -0/+33 |
2015-10-29 | merge-file: clamp exit code to maximum 127 | Jeff King | 1 | -0/+33 |
2015-03-20 | t: fix trivial &&-chain breakage | Jeff King | 1 | -1/+1 |
2014-05-15 | git-show: fix 'git show -s' to not add extra terminator after merge commit | Max Kirillov | 1 | -6/+5 |
2013-07-23 | t7600: fix typo in test title | Junio C Hamano | 1 | -1/+1 |
2013-07-02 | merge: handle --ff/--no-ff/--ff-only as a tri-state option | Miklos Vajna | 1 | -3/+9 |
2013-06-26 | Merge branch 'vl/typofix' | Junio C Hamano | 1 | -1/+1 |
2013-06-19 | random typofixes (committed missing a 't', successful missing an 's') | Veres Lajos | 1 | -1/+1 |
2013-03-25 | t7600: use test_config to set/unset git config variables | Yann Droneaud | 1 | -34/+26 |
2012-08-27 | Fix tests under GETTEXT_POISON on parseopt | Jiang Xin | 1 | -1/+1 |
2012-02-09 | merge: do not launch an editor on "--no-edit $tag" | Junio C Hamano | 1 | -0/+12 |
2012-02-05 | merge: do not create a signed tag merge under --ff-only option | Junio C Hamano | 1 | -0/+13 |
2011-11-08 | merge: record tag objects without peeling in MERGE_HEAD | Junio C Hamano | 1 | -1/+5 |
2011-11-07 | merge: notice local merging of tags and keep it unwrapped | Junio C Hamano | 1 | -3/+3 |
2011-10-12 | Teach merge the '[-e|--edit]' option | Jay Soffian | 1 | -0/+23 |
2011-05-16 | Merge branch 'mg/merge-ff-config' | Junio C Hamano | 1 | -6/+58 |
2011-05-11 | Merge branch 'jc/maint-branch-mergeoptions' | Junio C Hamano | 1 | -0/+32 |
2011-05-11 | Merge branch 'jn/maint-test-merge-verify-parents' | Junio C Hamano | 1 | -74/+73 |
2011-05-06 | tests: check git does not barf on merge.ff values for future versions of git | Jonathan Nieder | 1 | -2/+14 |
2011-05-06 | tests: teach verify_parents to check for extra parents | Jonathan Nieder | 1 | -0/+1 |
2011-05-06 | merge: introduce merge.ff configuration variable | Junio C Hamano | 1 | -2/+41 |