Age | Commit message (Expand) | Author | Files | Lines |
2011-03-19 | Merge branch 'jk/merge-rename-ux' | Junio C Hamano | 1 | -0/+7 |
2011-03-09 | i18n: git-merge "Wonderful" message | Ævar Arnfjörð Bjarmason | 1 | -1/+1 |
2011-03-09 | i18n: git-merge "Updating %s..%s" message | Ævar Arnfjörð Bjarmason | 1 | -1/+1 |
2011-03-09 | i18n: git-merge basic messages | Ævar Arnfjörð Bjarmason | 1 | -62/+62 |
2011-03-09 | Merge branch 'js/cherry-pick-usability' | Junio C Hamano | 1 | -0/+7 |
2011-02-27 | Merge branch 'mg/placeholders-are-lowercase' | Junio C Hamano | 1 | -1/+1 |
2011-02-27 | Merge branch 'js/maint-merge-use-prepare-commit-msg-hook' | Junio C Hamano | 1 | -8/+29 |
2011-02-21 | Introduce CHERRY_PICK_HEAD | Jay Soffian | 1 | -0/+7 |
2011-02-21 | merge: enable progress reporting for rename detection | Jeff King | 1 | -0/+7 |
2011-02-15 | merge: honor prepare-commit-msg hook | Jay Soffian | 1 | -8/+29 |
2011-02-15 | Make <identifier> lowercase as per CodingGuidelines | Michael J Gruber | 1 | -1/+1 |
2011-02-15 | Merge branch 'maint' | Junio C Hamano | 1 | -2/+2 |
2011-02-15 | commit,merge,tag: describe -m likewise | Michael J Gruber | 1 | -2/+2 |
2010-12-28 | cherry-pick/revert: add support for -X/--strategy-option | Jonathan Nieder | 1 | -2/+4 |
2010-12-12 | Merge branch 'jn/git-cmd-h-bypass-setup' | Junio C Hamano | 1 | -0/+3 |
2010-12-08 | Merge branch 'jh/notes-merge' | Junio C Hamano | 1 | -16/+31 |
2010-11-24 | Merge branch 'cb/maint-orphan-merge-noclobber' | Junio C Hamano | 1 | -1/+19 |
2010-11-17 | Provide 'git merge --abort' as a synonym to 'git reset --merge' | Johan Herland | 1 | -0/+14 |
2010-11-17 | cmd_merge(): Parse options before checking MERGE_HEAD | Johan Herland | 1 | -16/+17 |
2010-11-15 | do not overwrite untracked during merge from unborn branch | Clemens Buchacher | 1 | -1/+19 |
2010-11-03 | Change incorrect "remote branch" to "remote tracking branch" in C code | Matthieu Moy | 1 | -1/+1 |
2010-10-26 | Merge branch 'jf/merge-ignore-ws' | Junio C Hamano | 1 | -18/+2 |
2010-10-22 | merge -h: show usage even with corrupt index | Nguyễn Thái Ngọc Duy | 1 | -0/+2 |
2010-09-29 | Merge branch 'rr/fmt-merge-msg' | Junio C Hamano | 1 | -13/+19 |
2010-09-09 | merge: Make 'merge.log' an integer or boolean option | Ramkumar Ramachandra | 1 | -1/+6 |
2010-09-09 | merge: Make '--log' an integer option for number of shortlog entries | Ramkumar Ramachandra | 1 | -7/+10 |
2010-09-09 | fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len | Ramkumar Ramachandra | 1 | -8/+6 |
2010-09-03 | Merge branch 'dg/local-mod-error-messages' | Junio C Hamano | 1 | -2/+1 |
2010-09-03 | Merge branch 'jn/merge-custom-no-trivial' | Junio C Hamano | 1 | -0/+1 |
2010-09-03 | Merge branch 'jn/update-contrib-example-merge' | Junio C Hamano | 1 | -1/+1 |
2010-09-03 | Merge branch 'jn/merge-renormalize' | Junio C Hamano | 1 | -2/+14 |
2010-09-03 | Move "show_all_errors = 1" to setup_unpack_trees_porcelain() | Matthieu Moy | 1 | -1/+0 |
2010-09-03 | setup_unpack_trees_porcelain: take the whole options struct as parameter | Matthieu Moy | 1 | -1/+1 |
2010-09-03 | Move set_porcelain_error_msgs to unpack-trees.c and rename it | Matthieu Moy | 1 | -1/+1 |
2010-08-26 | merge-recursive: expose merge options for builtin merge | Jonathan Nieder | 1 | -18/+2 |
2010-08-21 | Merge branch 'gb/split-cmdline-errmsg' | Junio C Hamano | 1 | -1/+2 |
2010-08-18 | merge: do not mistake (ancestor of) tag for branch | Jonathan Nieder | 1 | -1/+1 |
2010-08-15 | merge: let custom strategies intervene in trivial merges | Jonathan Nieder | 1 | -0/+1 |
2010-08-11 | unpack_trees: group error messages by type | Matthieu Moy | 1 | -0/+1 |
2010-08-11 | merge-recursive: porcelain messages for checkout | Diane Gasselin | 1 | -1/+1 |
2010-08-11 | Turn unpack_trees_options.msgs into an array + enum | Matthieu Moy | 1 | -1/+1 |
2010-08-11 | split_cmdline: Allow caller to access error string | Greg Brockman | 1 | -1/+2 |
2010-08-06 | merge-recursive --renormalize | Jonathan Nieder | 1 | -5/+14 |
2010-07-02 | Avoid conflicts when merging branches with mixed normalization | Eyvind Bernhardsen | 1 | -0/+3 |
2010-06-18 | Merge branch 'tc/merge-m-log' | Junio C Hamano | 1 | -8/+12 |
2010-05-10 | merge: --log appends shortlog to message if specified | Tay Ray Chuan | 1 | -7/+11 |
2010-05-10 | merge: rename variable | Tay Ray Chuan | 1 | -3/+3 |
2010-05-10 | merge: update comment | Tay Ray Chuan | 1 | -1/+1 |
2010-05-08 | Merge branch 'cc/revert-strategy' | Junio C Hamano | 1 | -36/+45 |
2010-04-01 | merge: make function try_merge_command non static | Christian Couder | 1 | -2/+2 |