summaryrefslogtreecommitdiffstats
path: root/Documentation/git-merge.txt (follow)
Commit message (Expand)AuthorAgeFilesLines
* config.txt: move merge-config.txt to config/Nguyễn Thái Ngọc Duy2018-10-291-1/+1
* Merge branch 'en/dirty-merge-fixes'Junio C Hamano2018-08-031-3/+3
|\
| * merge: fix misleading pre-merge check documentationElijah Newren2018-07-111-3/+3
* | merge: allow reading the merge commit message from a fileJohannes Schindelin2018-07-111-1/+9
* | Merge branch 'mw/doc-merge-enumfix'Junio C Hamano2018-06-181-1/+1
|\ \ | |/ |/|
| * doc: update the order of the syntax `git merge --continue`Meng-Sung Wu2018-06-141-1/+1
* | Merge branch 'wk/pull-signoff'Junio C Hamano2017-11-061-8/+0
|\ \
| * | pull: pass --signoff/--no-signoff to "git merge"W. Trevor King2017-10-131-8/+0
* | | Merge branch 'wk/merge-options-gpg-sign-doc'Junio C Hamano2017-10-191-6/+0
|\ \ \ | |/ / |/| |
| * | Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull'W. Trevor King2017-10-121-6/+0
* | | Merge branch 'ma/up-to-date'Junio C Hamano2017-09-101-1/+1
|\ \ \
| * | | treewide: correct several "up-to-date" to "up to date"Martin Ågren2017-08-231-1/+1
| | |/ | |/|
* | | Merge branch 'mg/killed-merge'Junio C Hamano2017-08-271-1/+4
|\ \ \ | | |/ | |/|
| * | Documentation/git-merge: explain --continueMichael J Gruber2017-08-221-1/+4
| |/
* / merge: add a --signoff flagŁukasz Gryglicki2017-07-251-0/+8
|/
* Merge branch 'jc/merge-drop-old-syntax'Junio C Hamano2017-03-301-6/+1
|\
| * merge: drop 'git merge <message> HEAD <commit>' syntaxJunio C Hamano2015-04-291-6/+1
* | merge: add '--continue' option as a synonym for 'git commit'Chris Packham2016-12-141-0/+8
* | pull: pass --allow-unrelated-histories to "git merge"Junio C Hamano2016-04-211-13/+1
* | merge: refuse to create too cool a merge by defaultJunio C Hamano2016-03-231-0/+13
* | Merge branch 'mm/keyid-docs'Junio C Hamano2015-10-051-2/+4
|\ \
| * | Documentation: explain optional arguments betterMatthieu Moy2015-09-211-1/+3
| * | Documentation: use 'keyid' consistently, not 'key-id'Matthieu Moy2015-09-211-1/+1
* | | Merge branch 'po/doc-branch-desc'Junio C Hamano2015-09-171-1/+1
|\ \ \ | |/ / |/| |
| * | doc: show usage of branch descriptionPhilip Oakley2015-09-141-1/+1
* | | Merge branch 'jc/merge'Junio C Hamano2015-05-191-0/+4
|\ \ \ | | |/ | |/|
| * | merge: handle FETCH_HEAD internallyJunio C Hamano2015-04-291-0/+4
| |/
* / *config.txt: stick to camelCase naming conventionNguyễn Thái Ngọc Duy2015-03-141-2/+2
|/
* merge: enable defaulttoupstream by defaultFelipe Contreras2014-04-221-3/+2
* parse-options: multi-word argh should use dash to separate wordsJunio C Hamano2014-03-241-1/+1
* git-merge: document the -S optionNicolas Vigier2013-10-181-1/+5
* Merge branch 'maint-1.8.2' into maint-1.8.3Junio C Hamano2013-09-051-2/+2
|\
| * Documentation/git-merge.txt: fix formatting of example blockAndreas Schwab2013-09-051-2/+2
| * Merge branch 'yd/doc-merge-annotated-tag' into maintJunio C Hamano2013-04-011-0/+24
| |\
* | \ Merge branch 'mm/merge-in-dirty-worktree-doc' into maintJunio C Hamano2013-07-221-2/+2
|\ \ \
| * | | Documentation/git-merge.txt: weaken warning about uncommited changesMatthieu Moy2013-06-181-2/+2
| | |/ | |/|
* | | documentation: trivial style cleanupsFelipe Contreras2013-05-171-2/+1
* | | Merge branch 'yd/doc-merge-annotated-tag'Junio C Hamano2013-03-281-0/+24
|\| | | |/ |/|
| * Documentation: merging a tag is a special caseJunio C Hamano2013-03-211-0/+24
* | Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann2013-02-011-2/+2
|/
* Documentation: remote tracking branch -> remote-tracking branchMatthieu Moy2012-10-251-1/+1
* doc: A few minor copy edits.Štěpán Němec2012-07-151-1/+1
* merge: use editor by default in interactive sessionsJunio C Hamano2012-01-231-1/+1
* Merge branch 'jc/merge-sans-branch'Junio C Hamano2011-04-021-3/+8
|\
| * merge: merge with the default upstream branch without argumentJunio C Hamano2011-03-241-3/+8
* | doc: drop author/documentation sections from most pagesJeff King2011-03-111-9/+0
|/
* Merge branch 'jh/notes-merge'Junio C Hamano2010-12-081-3/+24
|\
| * Provide 'git merge --abort' as a synonym to 'git reset --merge'Johan Herland2010-11-171-3/+24
* | Fix a formatting error in git-merge.txtNathan W. Panike2010-10-291-7/+7
|/
* merge: --log appends shortlog to message if specifiedTay Ray Chuan2010-05-101-1/+6
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-20 06:16:15 +0100