| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'jk/format-patch-am' | Junio C Hamano | 2011-05-31 | 1 | -1/+2 |
|\ |
|
| * | clean up calling conventions for pretty.c functions | Jeff King | 2011-05-26 | 1 | -1/+2 |
* | | Merge branch 'jk/cherry-pick-root-with-resolve' | Junio C Hamano | 2011-05-19 | 1 | -2/+10 |
|\ \ |
|
| * | | cherry-pick: handle root commits with external strategies | Jeff King | 2011-05-16 | 1 | -2/+10 |
* | | | Merge branch 'mg/merge-ff-config' | Junio C Hamano | 2011-05-16 | 1 | -0/+9 |
|\ \ \ |
|
| * | | | merge: introduce merge.ff configuration variable | Junio C Hamano | 2011-05-06 | 1 | -0/+9 |
| * | | | Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config | Junio C Hamano | 2011-05-06 | 1 | -15/+26 |
| |/ / |
|
* | | | Merge branch 'jc/maint-branch-mergeoptions' | Junio C Hamano | 2011-05-11 | 1 | -15/+26 |
* | | | Merge branch 'ab/i18n-fixup' | Junio C Hamano | 2011-05-02 | 1 | -8/+8 |
|\ \ \ |
|
| * | | | i18n: mark merge CHERRY_PICK_HEAD messages for translation | Ævar Arnfjörð Bjarmason | 2011-04-12 | 1 | -3/+3 |
| * | | | i18n: mark merge "upstream" messages for translation | Ævar Arnfjörð Bjarmason | 2011-04-12 | 1 | -4/+4 |
| * | | | i18n: mark merge "Could not read from" message for translation | Ævar Arnfjörð Bjarmason | 2011-04-12 | 1 | -1/+1 |
| |/ / |
|
* | | | merge: allow "-" as a short-hand for "previous branch" | Junio C Hamano | 2011-04-07 | 1 | -3/+6 |
|/ / |
|
* | | Merge branch 'jc/merge-sans-branch' | Junio C Hamano | 2011-04-01 | 1 | -2/+40 |
|\ \ |
|
| * | | merge: merge with the default upstream branch without argument | Junio C Hamano | 2011-03-24 | 1 | -1/+38 |
| * | | merge: match the help text with the documentation | Jared Hance | 2011-03-24 | 1 | -2/+3 |
| |/ |
|
* | | Merge branch 'ab/i18n-st' | Junio C Hamano | 2011-04-01 | 1 | -64/+64 |
|\ \ |
|
| * | | i18n: git-merge "Wonderful" message | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -1/+1 |
| * | | i18n: git-merge "Updating %s..%s" message | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -1/+1 |
| * | | i18n: git-merge basic messages | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -62/+62 |
* | | | merge: merge unborn index before setting ref | Jeff King | 2011-03-25 | 1 | -1/+1 |
* | | | Merge branch 'jk/merge-rename-ux' | Junio C Hamano | 2011-03-19 | 1 | -0/+7 |
|\ \ \ |
|
| * | | | merge: enable progress reporting for rename detection | Jeff King | 2011-02-21 | 1 | -0/+7 |
| | |/
| |/| |
|
* | | | Merge branch 'js/cherry-pick-usability' | Junio C Hamano | 2011-03-09 | 1 | -0/+7 |
|\ \ \ |
|
| * | | | Introduce CHERRY_PICK_HEAD | Jay Soffian | 2011-02-21 | 1 | -0/+7 |
| |/ / |
|
* | | | Merge branch 'mg/placeholders-are-lowercase' | Junio C Hamano | 2011-02-27 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | Make <identifier> lowercase as per CodingGuidelines | Michael J Gruber | 2011-02-15 | 1 | -1/+1 |
* | | | | Merge branch 'js/maint-merge-use-prepare-commit-msg-hook' | Junio C Hamano | 2011-02-27 | 1 | -8/+29 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | merge: honor prepare-commit-msg hook | Jay Soffian | 2011-02-15 | 1 | -8/+29 |
| | |/
| |/| |
|
* | | | Merge branch 'maint' | Junio C Hamano | 2011-02-15 | 1 | -2/+2 |
|\ \ \
| | |/
| |/| |
|
| * | | commit,merge,tag: describe -m likewise | Michael J Gruber | 2011-02-15 | 1 | -2/+2 |
| |/ |
|
* | | cherry-pick/revert: add support for -X/--strategy-option | Jonathan Nieder | 2010-12-28 | 1 | -2/+4 |
|/ |
|
* | Merge branch 'jn/git-cmd-h-bypass-setup' | Junio C Hamano | 2010-12-12 | 1 | -0/+3 |
|\ |
|
| * | merge -h: show usage even with corrupt index | Nguyễn Thái Ngọc Duy | 2010-10-22 | 1 | -0/+2 |
* | | Merge branch 'jh/notes-merge' | Junio C Hamano | 2010-12-08 | 1 | -16/+31 |
|\ \ |
|
| * | | Provide 'git merge --abort' as a synonym to 'git reset --merge' | Johan Herland | 2010-11-17 | 1 | -0/+14 |
| * | | cmd_merge(): Parse options before checking MERGE_HEAD | Johan Herland | 2010-11-17 | 1 | -16/+17 |
* | | | Merge branch 'cb/maint-orphan-merge-noclobber' | Junio C Hamano | 2010-11-24 | 1 | -1/+19 |
|\ \ \ |
|
| * | | | do not overwrite untracked during merge from unborn branch | Clemens Buchacher | 2010-11-15 | 1 | -1/+19 |
| |/ / |
|
* | | | Change incorrect "remote branch" to "remote tracking branch" in C code | Matthieu Moy | 2010-11-03 | 1 | -1/+1 |
* | | | Merge branch 'jf/merge-ignore-ws' | Junio C Hamano | 2010-10-26 | 1 | -18/+2 |
|\ \ \ |
|
| * | | | merge-recursive: expose merge options for builtin merge | Jonathan Nieder | 2010-08-26 | 1 | -18/+2 |
* | | | | Merge branch 'rr/fmt-merge-msg' | Junio C Hamano | 2010-09-29 | 1 | -13/+19 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | merge: Make 'merge.log' an integer or boolean option | Ramkumar Ramachandra | 2010-09-09 | 1 | -1/+6 |
| * | | | merge: Make '--log' an integer option for number of shortlog entries | Ramkumar Ramachandra | 2010-09-09 | 1 | -7/+10 |
| * | | | fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len | Ramkumar Ramachandra | 2010-09-09 | 1 | -8/+6 |
* | | | | Merge branch 'dg/local-mod-error-messages' | Junio C Hamano | 2010-09-03 | 1 | -2/+1 |
|\ \ \ \ |
|
| * | | | | Move "show_all_errors = 1" to setup_unpack_trees_porcelain() | Matthieu Moy | 2010-09-03 | 1 | -1/+0 |
| * | | | | setup_unpack_trees_porcelain: take the whole options struct as parameter | Matthieu Moy | 2010-09-03 | 1 | -1/+1 |
| * | | | | Move set_porcelain_error_msgs to unpack-trees.c and rename it | Matthieu Moy | 2010-09-03 | 1 | -1/+1 |