| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | merge: enable defaulttoupstream by defaultfc/merge-default-to-upstream | Felipe Contreras | 2014-04-22 | 1 | -3/+2 |
| * | parse-options: multi-word argh should use dash to separate words | Junio C Hamano | 2014-03-24 | 1 | -1/+1 |
| * | git-merge: document the -S option | Nicolas Vigier | 2013-10-18 | 1 | -1/+5 |
| * | Merge branch 'maint-1.8.2' into maint-1.8.3maint-1.8.3 | Junio C Hamano | 2013-09-05 | 1 | -2/+2 |
| |\ |
|
| | * | Documentation/git-merge.txt: fix formatting of example blockmaint-1.8.2 | Andreas Schwab | 2013-09-05 | 1 | -2/+2 |
| | * | Merge branch 'yd/doc-merge-annotated-tag' into maint | Junio C Hamano | 2013-04-01 | 1 | -0/+24 |
| | |\ |
|
| * | \ | Merge branch 'mm/merge-in-dirty-worktree-doc' into maint | Junio C Hamano | 2013-07-21 | 1 | -2/+2 |
| |\ \ \ |
|
| | * | | | Documentation/git-merge.txt: weaken warning about uncommited changes | Matthieu Moy | 2013-06-18 | 1 | -2/+2 |
| | | |/
| |/| |
|
| * | | | documentation: trivial style cleanups | Felipe Contreras | 2013-05-17 | 1 | -2/+1 |
| * | | | Merge branch 'yd/doc-merge-annotated-tag' | Junio C Hamano | 2013-03-28 | 1 | -0/+24 |
| |\ \ \
| |/ /
| | /
| |/
|/| |
|
| | * | Documentation: merging a tag is a special case | Junio C Hamano | 2013-03-21 | 1 | -0/+24 |
| * | | Documentation: the name of the system is 'Git', not 'git' | Thomas Ackermann | 2013-02-01 | 1 | -2/+2 |
| |/ |
|
| * | Documentation: remote tracking branch -> remote-tracking branch | Matthieu Moy | 2012-10-25 | 1 | -1/+1 |
| * | doc: A few minor copy edits. | Štěpán Němec | 2012-07-14 | 1 | -1/+1 |
| * | merge: use editor by default in interactive sessions | Junio C Hamano | 2012-01-23 | 1 | -1/+1 |
| * | Merge branch 'jc/merge-sans-branch' | Junio C Hamano | 2011-04-01 | 1 | -3/+8 |
| |\ |
|
| | * | merge: merge with the default upstream branch without argument | Junio C Hamano | 2011-03-24 | 1 | -3/+8 |
| * | | doc: drop author/documentation sections from most pages | Jeff King | 2011-03-11 | 1 | -9/+0 |
| |/ |
|
| * | Merge branch 'jh/notes-merge' | Junio C Hamano | 2010-12-08 | 1 | -3/+24 |
| |\ |
|
| | * | Provide 'git merge --abort' as a synonym to 'git reset --merge' | Johan Herland | 2010-11-17 | 1 | -3/+24 |
| * | | Fix a formatting error in git-merge.txt | Nathan W. Panike | 2010-10-29 | 1 | -7/+7 |
| |/ |
|
| * | merge: --log appends shortlog to message if specified | Tay Ray Chuan | 2010-05-10 | 1 | -1/+6 |
| * | Docs: Add -X option to git-merge's synopsis. | Marc Branchaud | 2010-04-12 | 1 | -1/+2 |
| * | Merge branch 'doc-style/for-next' of git://repo.or.cz/git/trast | Junio C Hamano | 2010-01-24 | 1 | -78/+100 |
| |\ |
|
| | * | Documentation: merge: use MERGE_HEAD to refer to the remote branch | Jonathan Nieder | 2010-01-24 | 1 | -6/+8 |
| | * | Documentation: simplify How Merge Works | Jonathan Nieder | 2010-01-24 | 1 | -36/+16 |
| | * | Documentation: merge: add a section about fast-forward | Jonathan Nieder | 2010-01-24 | 1 | -13/+18 |
| | * | Documentation: emphasize when git merge terminates early | Jonathan Nieder | 2010-01-24 | 1 | -10/+21 |
| | * | Documentation: merge: add an overview | Jonathan Nieder | 2010-01-24 | 1 | -2/+26 |
| | * | Documentation: merge: move merge strategy list to end | Jonathan Nieder | 2010-01-24 | 1 | -2/+2 |
| | * | Documentation: suggest `reset --merge` in How Merge Works section | Jonathan Nieder | 2010-01-24 | 1 | -3/+3 |
| | * | Documentation: merge: move configuration section to end | Jonathan Nieder | 2010-01-24 | 1 | -9/+9 |
| * | | Merge remote branch 'remotes/trast-doc/for-next' | Junio C Hamano | 2010-01-20 | 1 | -25/+29 |
| |\ \
| |/ |
|
| | * | Documentation: spell 'git cmd' without dash throughout | Thomas Rast | 2010-01-10 | 1 | -3/+3 |
| | * | Documentation: format full commands in typewriter font | Thomas Rast | 2010-01-10 | 1 | -7/+7 |
| | * | Documentation: warn prominently against merging with dirty trees | Thomas Rast | 2010-01-09 | 1 | -0/+4 |
| | * | Documentation/git-merge: reword references to "remote" and "pull" | Thomas Rast | 2010-01-09 | 1 | -17/+17 |
| * | | Teach --[no-]rerere-autoupdate option to merge, revert and friends | Junio C Hamano | 2009-12-04 | 1 | -1/+6 |
| |/ |
|
| * | modernize fetch/merge/pull examples | Clemens Buchacher | 2009-10-21 | 1 | -0/+33 |
| * | Documentation: clarify mergeoptions description | Jonathan Nieder | 2009-10-09 | 1 | -2/+2 |
| * | Documentation: git fmt-merge-msg does not have to be a script | Jonathan Nieder | 2009-10-09 | 1 | -3/+4 |
| * | Documentation: merge: one <remote> is required | Paul Bolle | 2009-08-12 | 1 | -1/+1 |
| * | Grammar fix for "git merge" man page | Wincent Colaiuta | 2009-03-26 | 1 | -1/+1 |
| * | Grammar fixes to "merge" and "patch-id" docs | Wincent Colaiuta | 2009-03-25 | 1 | -1/+1 |
| * | Documentation: remove extra quoting/emphasis around literal texts | Chris Johnsen | 2009-03-17 | 1 | -3/+3 |
| * | Improve language in git-merge.txt and related docs | Ralf Wildenhues | 2008-12-09 | 1 | -17/+17 |
| * | Merge branch 'jc/better-conflict-resolution' | Shawn O. Pearce | 2008-09-29 | 1 | -0/+65 |
| |\ |
|
| | * | Fix AsciiDoc errors in merge documentation | Johan Herland | 2008-09-04 | 1 | -4/+4 |
| | * | git-merge documentation: describe how conflict is presented | Junio C Hamano | 2008-08-31 | 1 | -0/+65 |
| * | | git-merge documentation: more details about resolving conflicts | Dan Hensgen | 2008-08-22 | 1 | -6/+18 |
| |/ |
|
