| Commit message (Expand) | Author | Age |
|---|
| * | Merge branch 'mg/placeholders-are-lowercase' into maint | Junio C Hamano | 2011-03-16 |
| |\ |
|
| | * | Make <identifier> lowercase as per CodingGuidelines | Michael J Gruber | 2011-02-15 |
| * | | Merge branch 'js/maint-merge-use-prepare-commit-msg-hook' into maint | Junio C Hamano | 2011-03-16 |
| |\ \
| |/
|/| |
|
| | * | merge: honor prepare-commit-msg hook | Jay Soffian | 2011-02-15 |
| * | | commit,merge,tag: describe -m likewise | Michael J Gruber | 2011-02-15 |
| |/ |
|
| * | Merge branch 'jn/git-cmd-h-bypass-setup' | Junio C Hamano | 2010-12-12 |
| |\ |
|
| | * | merge -h: show usage even with corrupt index | Nguyễn Thái Ngọc Duy | 2010-10-22 |
| * | | 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 |
| | * | | cmd_merge(): Parse options before checking MERGE_HEAD | Johan Herland | 2010-11-17 |
| * | | | Merge branch 'cb/maint-orphan-merge-noclobber' | Junio C Hamano | 2010-11-24 |
| |\ \ \ |
|
| | * | | | do not overwrite untracked during merge from unborn branch | Clemens Buchacher | 2010-11-15 |
| | |/ / |
|
| * | | | Change incorrect "remote branch" to "remote tracking branch" in C code | Matthieu Moy | 2010-11-03 |
| * | | | Merge branch 'jf/merge-ignore-ws' | Junio C Hamano | 2010-10-26 |
| |\ \ \ |
|
| | * | | | merge-recursive: expose merge options for builtin merge | Jonathan Nieder | 2010-08-26 |
| * | | | | Merge branch 'rr/fmt-merge-msg' | Junio C Hamano | 2010-09-29 |
| |\ \ \ \
| |_|_|/
|/| | | |
|
| | * | | | merge: Make 'merge.log' an integer or boolean option | Ramkumar Ramachandra | 2010-09-09 |
| | * | | | merge: Make '--log' an integer option for number of shortlog entries | Ramkumar Ramachandra | 2010-09-09 |
| | * | | | fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len | Ramkumar Ramachandra | 2010-09-09 |
| * | | | | Merge branch 'dg/local-mod-error-messages' | Junio C Hamano | 2010-09-03 |
| |\ \ \ \ |
|
| | * | | | | Move "show_all_errors = 1" to setup_unpack_trees_porcelain() | Matthieu Moy | 2010-09-03 |
| | * | | | | setup_unpack_trees_porcelain: take the whole options struct as parameter | Matthieu Moy | 2010-09-03 |
| | * | | | | Move set_porcelain_error_msgs to unpack-trees.c and rename it | Matthieu Moy | 2010-09-03 |
| * | | | | | Merge branch 'jn/merge-custom-no-trivial' | Junio C Hamano | 2010-09-03 |
| |\ \ \ \ \ |
|
| | * | | | | | merge: let custom strategies intervene in trivial merges | Jonathan Nieder | 2010-08-15 |
| | | |_|_|/
| |/| | | |
|
| * | | | | | Merge branch 'jn/update-contrib-example-merge' | Junio C Hamano | 2010-09-03 |
| |\ \ \ \ \
| | |_|/ /
| |/| | | |
|
| | * | | | | merge: do not mistake (ancestor of) tag for branch | Jonathan Nieder | 2010-08-18 |
| | |/ / / |
|
| * | | | | Merge branch 'jn/merge-renormalize' | Junio C Hamano | 2010-09-03 |
| |\ \ \ \
| | |_|/
| |/| | |
|
| | * | | | merge-recursive --renormalize | Jonathan Nieder | 2010-08-06 |
| | * | | | Avoid conflicts when merging branches with mixed normalization | Eyvind Bernhardsen | 2010-07-02 |
| | |/ / |
|
| * | | | Merge branch 'gb/split-cmdline-errmsg' | Junio C Hamano | 2010-08-21 |
| |\ \ \
| |_|/
|/| | |
|
| | * | | split_cmdline: Allow caller to access error string | Greg Brockman | 2010-08-11 |
| | |/ |
|
| * | | unpack_trees: group error messages by type | Matthieu Moy | 2010-08-11 |
| * | | merge-recursive: porcelain messages for checkout | Diane Gasselin | 2010-08-11 |
| * | | Turn unpack_trees_options.msgs into an array + enum | Matthieu Moy | 2010-08-11 |
| |/ |
|
| * | Merge branch 'tc/merge-m-log' | Junio C Hamano | 2010-06-18 |
| |\ |
|
| | * | merge: --log appends shortlog to message if specified | Tay Ray Chuan | 2010-05-10 |
| | * | merge: rename variable | Tay Ray Chuan | 2010-05-10 |
| | * | merge: update comment | Tay Ray Chuan | 2010-05-10 |
| * | | Merge branch 'cc/revert-strategy' | Junio C Hamano | 2010-05-08 |
| |\ \
| |/
|/| |
|
| | * | merge: make function try_merge_command non static | Christian Couder | 2010-04-01 |
| | * | merge: refactor code that calls "git merge-STRATEGY" | Christian Couder | 2010-04-01 |
| * | | Merge branch 'cc/cherry-pick-ff' | Junio C Hamano | 2010-03-28 |
| |/ |
|
| * | Move 'builtin-*' into a 'builtin/' subdirectory | Linus Torvalds | 2010-02-22 |
