Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge branch 'jn/merge-custom-no-trivial' | Junio C Hamano | 2010-09-03 | 1 | -0/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | merge: let custom strategies intervene in trivial merges | Jonathan Nieder | 2010-08-15 | 1 | -0/+1 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge branch 'jn/update-contrib-example-merge' | Junio C Hamano | 2010-09-03 | 1 | -1/+1 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | ||||||
| * | | | | merge: do not mistake (ancestor of) tag for branch | Jonathan Nieder | 2010-08-18 | 1 | -1/+1 | |
| |/ / / | ||||||
* | | | | Merge branch 'jn/merge-renormalize' | Junio C Hamano | 2010-09-03 | 1 | -2/+14 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | merge-recursive --renormalize | Jonathan Nieder | 2010-08-06 | 1 | -5/+14 | |
| * | | | Avoid conflicts when merging branches with mixed normalization | Eyvind Bernhardsen | 2010-07-02 | 1 | -0/+3 | |
| |/ / | ||||||
* | | | Merge branch 'gb/split-cmdline-errmsg' | Junio C Hamano | 2010-08-21 | 1 | -1/+2 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | split_cmdline: Allow caller to access error string | Greg Brockman | 2010-08-11 | 1 | -1/+2 | |
| |/ | ||||||
* | | unpack_trees: group error messages by type | Matthieu Moy | 2010-08-11 | 1 | -0/+1 | |
* | | merge-recursive: porcelain messages for checkout | Diane Gasselin | 2010-08-11 | 1 | -1/+1 | |
* | | Turn unpack_trees_options.msgs into an array + enum | Matthieu Moy | 2010-08-11 | 1 | -1/+1 | |
|/ | ||||||
* | Merge branch 'tc/merge-m-log' | Junio C Hamano | 2010-06-18 | 1 | -8/+12 | |
|\ | ||||||
| * | merge: --log appends shortlog to message if specified | Tay Ray Chuan | 2010-05-10 | 1 | -7/+11 | |
| * | merge: rename variable | Tay Ray Chuan | 2010-05-10 | 1 | -3/+3 | |
| * | merge: update comment | Tay Ray Chuan | 2010-05-10 | 1 | -1/+1 | |
* | | Merge branch 'cc/revert-strategy' | Junio C Hamano | 2010-05-08 | 1 | -36/+45 | |
|\ \ | |/ |/| | ||||||
| * | merge: make function try_merge_command non static | Christian Couder | 2010-04-01 | 1 | -2/+2 | |
| * | merge: refactor code that calls "git merge-STRATEGY" | Christian Couder | 2010-04-01 | 1 | -36/+45 | |
* | | Merge branch 'cc/cherry-pick-ff' | Junio C Hamano | 2010-03-28 | 1 | -1/+1 | |
|/ | ||||||
* | Move 'builtin-*' into a 'builtin/' subdirectory | Linus Torvalds | 2010-02-22 | 1 | -0/+1292 |