Age | Commit message (Expand) | Author | Files | Lines |
2022-01-05 | Merge branch 'jc/merge-detached-head-name' | Junio C Hamano | 1 | -1/+7 |
2021-12-20 | merge: allow to pretend a merge is made into a different branch | Junio C Hamano | 1 | -1/+7 |
2021-12-01 | update documentation for new zdiff3 conflictStyle | Elijah Newren | 1 | -5/+27 |
2021-07-22 | pull: update docs & code for option compatibility with rebasing | Elijah Newren | 1 | -0/+2 |
2020-05-05 | Doc: reference the "stash list" in autostash docs | Denton Liu | 1 | -2/+2 |
2020-04-10 | merge: teach --autostash option | Denton Liu | 1 | -3/+8 |
2019-08-07 | merge: do no-verify like commit | Michael J Gruber | 1 | -1/+1 |
2019-07-09 | Merge branch 'nd/switch-and-restore' | Junio C Hamano | 1 | -0/+5 |
2019-07-09 | Merge branch 'pw/doc-synopsis-markup-opmode-options' | Junio C Hamano | 1 | -2/+1 |
2019-06-17 | show --continue/skip etc. consistently in synopsis | Phillip Wood | 1 | -2/+1 |
2019-06-13 | Merge branch 'nd/merge-quit' | Junio C Hamano | 1 | -0/+4 |
2019-05-19 | merge: add --quit | Nguyễn Thái Ngọc Duy | 1 | -0/+4 |
2019-04-02 | doc: document --overwrite-ignore | Nguyễn Thái Ngọc Duy | 1 | -0/+5 |
2019-03-18 | merge: tweak --rerere-autoupdate documentation | Phillip Wood | 1 | -1/+2 |
2018-10-29 | config.txt: move merge-config.txt to config/ | Nguyễn Thái Ngọc Duy | 1 | -1/+1 |
2018-08-02 | Merge branch 'en/dirty-merge-fixes' | Junio C Hamano | 1 | -3/+3 |
2018-07-11 | merge: allow reading the merge commit message from a file | Johannes Schindelin | 1 | -1/+9 |
2018-07-11 | merge: fix misleading pre-merge check documentation | Elijah Newren | 1 | -3/+3 |
2018-06-18 | Merge branch 'mw/doc-merge-enumfix' | Junio C Hamano | 1 | -1/+1 |
2018-06-14 | doc: update the order of the syntax `git merge --continue` | Meng-Sung Wu | 1 | -1/+1 |
2017-11-06 | Merge branch 'wk/pull-signoff' | Junio C Hamano | 1 | -8/+0 |
2017-10-19 | Merge branch 'wk/merge-options-gpg-sign-doc' | Junio C Hamano | 1 | -6/+0 |
2017-10-13 | pull: pass --signoff/--no-signoff to "git merge" | W. Trevor King | 1 | -8/+0 |
2017-10-12 | Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull' | W. Trevor King | 1 | -6/+0 |
2017-09-10 | Merge branch 'ma/up-to-date' | Junio C Hamano | 1 | -1/+1 |
2017-08-26 | Merge branch 'mg/killed-merge' | Junio C Hamano | 1 | -1/+4 |
2017-08-23 | treewide: correct several "up-to-date" to "up to date" | Martin Ågren | 1 | -1/+1 |
2017-08-21 | Documentation/git-merge: explain --continue | Michael J Gruber | 1 | -1/+4 |
2017-07-25 | merge: add a --signoff flag | Łukasz Gryglicki | 1 | -0/+8 |
2017-03-30 | Merge branch 'jc/merge-drop-old-syntax' | Junio C Hamano | 1 | -6/+1 |
2016-12-14 | merge: add '--continue' option as a synonym for 'git commit' | Chris Packham | 1 | -0/+8 |
2016-04-21 | pull: pass --allow-unrelated-histories to "git merge" | Junio C Hamano | 1 | -13/+1 |
2016-03-23 | merge: refuse to create too cool a merge by default | Junio C Hamano | 1 | -0/+13 |
2015-10-05 | Merge branch 'mm/keyid-docs' | Junio C Hamano | 1 | -2/+4 |
2015-09-21 | Documentation: explain optional arguments better | Matthieu Moy | 1 | -1/+3 |
2015-09-21 | Documentation: use 'keyid' consistently, not 'key-id' | Matthieu Moy | 1 | -1/+1 |
2015-09-17 | Merge branch 'po/doc-branch-desc' | Junio C Hamano | 1 | -1/+1 |
2015-09-14 | doc: show usage of branch description | Philip Oakley | 1 | -1/+1 |
2015-05-19 | Merge branch 'jc/merge' | Junio C Hamano | 1 | -0/+4 |
2015-04-29 | merge: drop 'git merge <message> HEAD <commit>' syntax | Junio C Hamano | 1 | -6/+1 |
2015-04-29 | merge: handle FETCH_HEAD internally | Junio C Hamano | 1 | -0/+4 |
2015-03-13 | *config.txt: stick to camelCase naming convention | Nguyễn Thái Ngọc Duy | 1 | -2/+2 |
2014-04-22 | merge: enable defaulttoupstream by default | Felipe Contreras | 1 | -3/+2 |
2014-03-24 | parse-options: multi-word argh should use dash to separate words | Junio C Hamano | 1 | -1/+1 |
2013-10-18 | git-merge: document the -S option | Nicolas Vigier | 1 | -1/+5 |
2013-09-05 | Merge branch 'maint-1.8.2' into maint-1.8.3 | Junio C Hamano | 1 | -2/+2 |
2013-09-05 | Documentation/git-merge.txt: fix formatting of example block | Andreas Schwab | 1 | -2/+2 |
2013-07-21 | Merge branch 'mm/merge-in-dirty-worktree-doc' into maint | Junio C Hamano | 1 | -2/+2 |
2013-06-18 | Documentation/git-merge.txt: weaken warning about uncommited changes | Matthieu Moy | 1 | -2/+2 |
2013-05-17 | documentation: trivial style cleanups | Felipe Contreras | 1 | -2/+1 |