| Commit message (Expand) | Author | Age |
* | Merge branch 'mm/keyid-docs' | Junio C Hamano | 2015-10-05 |
|\ |
|
| * | Documentation: explain optional arguments better | Matthieu Moy | 2015-09-21 |
| * | Documentation: use 'keyid' consistently, not 'key-id' | Matthieu Moy | 2015-09-21 |
* | | Merge branch 'po/doc-branch-desc' | Junio C Hamano | 2015-09-17 |
|\ \
| |/
|/| |
|
| * | doc: show usage of branch description | Philip Oakley | 2015-09-14 |
* | | Merge branch 'jc/merge' | Junio C Hamano | 2015-05-19 |
|\ \ |
|
| * | | merge: handle FETCH_HEAD internally | Junio C Hamano | 2015-04-29 |
| |/ |
|
* | | *config.txt: stick to camelCase naming convention | Nguyễn Thái Ngọc Duy | 2015-03-13 |
|/ |
|
* | merge: enable defaulttoupstream by default | Felipe Contreras | 2014-04-22 |
* | parse-options: multi-word argh should use dash to separate words | Junio C Hamano | 2014-03-24 |
* | git-merge: document the -S option | Nicolas Vigier | 2013-10-18 |
* | Merge branch 'maint-1.8.2' into maint-1.8.3 | Junio C Hamano | 2013-09-05 |
|\ |
|
| * | Documentation/git-merge.txt: fix formatting of example block | Andreas Schwab | 2013-09-05 |
| * | Merge branch 'yd/doc-merge-annotated-tag' into maint | Junio C Hamano | 2013-04-01 |
| |\ |
|
* | \ | Merge branch 'mm/merge-in-dirty-worktree-doc' into maint | Junio C Hamano | 2013-07-21 |
|\ \ \ |
|
| * | | | Documentation/git-merge.txt: weaken warning about uncommited changes | Matthieu Moy | 2013-06-18 |
| | |/
| |/| |
|
* | | | documentation: trivial style cleanups | Felipe Contreras | 2013-05-17 |
* | | | Merge branch 'yd/doc-merge-annotated-tag' | Junio C Hamano | 2013-03-28 |
|\ \ \
| |/ /
| | /
| |/
|/| |
|
| * | Documentation: merging a tag is a special case | Junio C Hamano | 2013-03-21 |
* | | Documentation: the name of the system is 'Git', not 'git' | Thomas Ackermann | 2013-02-01 |
|/ |
|
* | Documentation: remote tracking branch -> remote-tracking branch | Matthieu Moy | 2012-10-25 |
* | doc: A few minor copy edits. | Štěpán Němec | 2012-07-14 |
* | merge: use editor by default in interactive sessions | Junio C Hamano | 2012-01-23 |
* | Merge branch 'jc/merge-sans-branch' | Junio C Hamano | 2011-04-01 |
|\ |
|
| * | merge: merge with the default upstream branch without argument | Junio C Hamano | 2011-03-24 |
* | | doc: drop author/documentation sections from most pages | Jeff King | 2011-03-11 |
|/ |
|
* | Merge branch 'jh/notes-merge' | Junio C Hamano | 2010-12-08 |
|\ |
|
| * | Provide 'git merge --abort' as a synonym to 'git reset --merge' | Johan Herland | 2010-11-17 |
* | | Fix a formatting error in git-merge.txt | Nathan W. Panike | 2010-10-29 |
|/ |
|
* | merge: --log appends shortlog to message if specified | Tay Ray Chuan | 2010-05-10 |
* | Docs: Add -X option to git-merge's synopsis. | Marc Branchaud | 2010-04-12 |
* | Merge branch 'doc-style/for-next' of git://repo.or.cz/git/trast | Junio C Hamano | 2010-01-24 |
|\ |
|
| * | Documentation: merge: use MERGE_HEAD to refer to the remote branch | Jonathan Nieder | 2010-01-24 |
| * | Documentation: simplify How Merge Works | Jonathan Nieder | 2010-01-24 |
| * | Documentation: merge: add a section about fast-forward | Jonathan Nieder | 2010-01-24 |
| * | Documentation: emphasize when git merge terminates early | Jonathan Nieder | 2010-01-24 |
| * | Documentation: merge: add an overview | Jonathan Nieder | 2010-01-24 |
| * | Documentation: merge: move merge strategy list to end | Jonathan Nieder | 2010-01-24 |
| * | Documentation: suggest `reset --merge` in How Merge Works section | Jonathan Nieder | 2010-01-24 |
| * | Documentation: merge: move configuration section to end | Jonathan Nieder | 2010-01-24 |
* | | Merge remote branch 'remotes/trast-doc/for-next' | Junio C Hamano | 2010-01-20 |
|\ \
| |/ |
|
| * | Documentation: spell 'git cmd' without dash throughout | Thomas Rast | 2010-01-10 |
| * | Documentation: format full commands in typewriter font | Thomas Rast | 2010-01-10 |
| * | Documentation: warn prominently against merging with dirty trees | Thomas Rast | 2010-01-09 |
| * | Documentation/git-merge: reword references to "remote" and "pull" | Thomas Rast | 2010-01-09 |
* | | Teach --[no-]rerere-autoupdate option to merge, revert and friends | Junio C Hamano | 2009-12-04 |
|/ |
|
* | modernize fetch/merge/pull examples | Clemens Buchacher | 2009-10-21 |
* | Documentation: clarify mergeoptions description | Jonathan Nieder | 2009-10-09 |
* | Documentation: git fmt-merge-msg does not have to be a script | Jonathan Nieder | 2009-10-09 |
* | Documentation: merge: one <remote> is required | Paul Bolle | 2009-08-12 |