summaryrefslogtreecommitdiff
path: root/builtin/merge.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jn/git-cmd-h-bypass-setup'Junio C Hamano2010-12-121-0/+3
|\
| * merge -h: show usage even with corrupt indexNguyễn Thái Ngọc Duy2010-10-221-0/+2
* | Merge branch 'jh/notes-merge'Junio C Hamano2010-12-081-16/+31
|\ \
| * | Provide 'git merge --abort' as a synonym to 'git reset --merge'Johan Herland2010-11-171-0/+14
| * | cmd_merge(): Parse options before checking MERGE_HEADJohan Herland2010-11-171-16/+17
* | | Merge branch 'cb/maint-orphan-merge-noclobber'Junio C Hamano2010-11-241-1/+19
|\ \ \
| * | | do not overwrite untracked during merge from unborn branchClemens Buchacher2010-11-151-1/+19
| |/ /
* | | Change incorrect "remote branch" to "remote tracking branch" in C codeMatthieu Moy2010-11-031-1/+1
* | | Merge branch 'jf/merge-ignore-ws'Junio C Hamano2010-10-261-18/+2
|\ \ \
| * | | merge-recursive: expose merge options for builtin mergeJonathan Nieder2010-08-261-18/+2
* | | | Merge branch 'rr/fmt-merge-msg'Junio C Hamano2010-09-291-13/+19
|\ \ \ \ | |_|_|/ |/| | |
| * | | merge: Make 'merge.log' an integer or boolean optionRamkumar Ramachandra2010-09-091-1/+6
| * | | merge: Make '--log' an integer option for number of shortlog entriesRamkumar Ramachandra2010-09-091-7/+10
| * | | fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_lenRamkumar Ramachandra2010-09-091-8/+6
* | | | Merge branch 'dg/local-mod-error-messages'Junio C Hamano2010-09-031-2/+1
|\ \ \ \
| * | | | Move "show_all_errors = 1" to setup_unpack_trees_porcelain()Matthieu Moy2010-09-031-1/+0
| * | | | setup_unpack_trees_porcelain: take the whole options struct as parameterMatthieu Moy2010-09-031-1/+1
| * | | | Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy2010-09-031-1/+1
* | | | | Merge branch 'jn/merge-custom-no-trivial'Junio C Hamano2010-09-031-0/+1
|\ \ \ \ \
| * | | | | merge: let custom strategies intervene in trivial mergesJonathan Nieder2010-08-151-0/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jn/update-contrib-example-merge'Junio C Hamano2010-09-031-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | merge: do not mistake (ancestor of) tag for branchJonathan Nieder2010-08-181-1/+1
| |/ / /
* | | | Merge branch 'jn/merge-renormalize'Junio C Hamano2010-09-031-2/+14
|\ \ \ \ | | |_|/ | |/| |
| * | | merge-recursive --renormalizeJonathan Nieder2010-08-061-5/+14
| * | | Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen2010-07-021-0/+3
| |/ /
* | | Merge branch 'gb/split-cmdline-errmsg'Junio C Hamano2010-08-211-1/+2
|\ \ \ | |_|/ |/| |
| * | split_cmdline: Allow caller to access error stringGreg Brockman2010-08-111-1/+2
| |/
* | unpack_trees: group error messages by typeMatthieu Moy2010-08-111-0/+1
* | merge-recursive: porcelain messages for checkoutDiane Gasselin2010-08-111-1/+1
* | Turn unpack_trees_options.msgs into an array + enumMatthieu Moy2010-08-111-1/+1
|/
* Merge branch 'tc/merge-m-log'Junio C Hamano2010-06-181-8/+12
|\
| * merge: --log appends shortlog to message if specifiedTay Ray Chuan2010-05-101-7/+11
| * merge: rename variableTay Ray Chuan2010-05-101-3/+3
| * merge: update commentTay Ray Chuan2010-05-101-1/+1
* | Merge branch 'cc/revert-strategy'Junio C Hamano2010-05-081-36/+45
|\ \ | |/ |/|
| * merge: make function try_merge_command non staticChristian Couder2010-04-011-2/+2
| * merge: refactor code that calls "git merge-STRATEGY"Christian Couder2010-04-011-36/+45
* | Merge branch 'cc/cherry-pick-ff'Junio C Hamano2010-03-281-1/+1
|/
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-0/+1292
View Lorry Controller Status