summaryrefslogtreecommitdiff
path: root/builtin/merge.c
AgeCommit message (Expand)Author
2011-02-15commit,merge,tag: describe -m likewiseMichael J Gruber
2010-12-13Merge branch 'jn/git-cmd-h-bypass-setup'Junio C Hamano
2010-12-08Merge branch 'jh/notes-merge'Junio C Hamano
2010-11-24Merge branch 'cb/maint-orphan-merge-noclobber'Junio C Hamano
2010-11-17Provide 'git merge --abort' as a synonym to 'git reset --merge'Johan Herland
2010-11-17cmd_merge(): Parse options before checking MERGE_HEADJohan Herland
2010-11-15do not overwrite untracked during merge from unborn branchClemens Buchacher
2010-11-03Change incorrect "remote branch" to "remote tracking branch" in C codeMatthieu Moy
2010-10-27Merge branch 'jf/merge-ignore-ws'Junio C Hamano
2010-10-22merge -h: show usage even with corrupt indexNguyễn Thái Ngọc Duy
2010-09-29Merge branch 'rr/fmt-merge-msg'Junio C Hamano
2010-09-09merge: Make 'merge.log' an integer or boolean optionRamkumar Ramachandra
2010-09-09merge: Make '--log' an integer option for number of shortlog entriesRamkumar Ramachandra
2010-09-09fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_lenRamkumar Ramachandra
2010-09-04Merge branch 'dg/local-mod-error-messages'Junio C Hamano
2010-09-03Merge branch 'jn/merge-custom-no-trivial'Junio C Hamano
2010-09-03Merge branch 'jn/update-contrib-example-merge'Junio C Hamano
2010-09-03Merge branch 'jn/merge-renormalize'Junio C Hamano
2010-09-03Move "show_all_errors = 1" to setup_unpack_trees_porcelain()Matthieu Moy
2010-09-03setup_unpack_trees_porcelain: take the whole options struct as parameterMatthieu Moy
2010-09-03Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy
2010-08-26merge-recursive: expose merge options for builtin mergeJonathan Nieder
2010-08-22Merge branch 'gb/split-cmdline-errmsg'Junio C Hamano
2010-08-18merge: do not mistake (ancestor of) tag for branchJonathan Nieder
2010-08-16merge: let custom strategies intervene in trivial mergesJonathan Nieder
2010-08-11unpack_trees: group error messages by typeMatthieu Moy
2010-08-11merge-recursive: porcelain messages for checkoutDiane Gasselin
2010-08-11Turn unpack_trees_options.msgs into an array + enumMatthieu Moy
2010-08-11split_cmdline: Allow caller to access error stringGreg Brockman
2010-08-06merge-recursive --renormalizeJonathan Nieder
2010-07-02Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen
2010-06-18Merge branch 'tc/merge-m-log'Junio C Hamano
2010-05-10merge: --log appends shortlog to message if specifiedTay Ray Chuan
2010-05-10merge: rename variableTay Ray Chuan
2010-05-10merge: update commentTay Ray Chuan
2010-05-09Merge branch 'cc/revert-strategy'Junio C Hamano
2010-04-01merge: make function try_merge_command non staticChristian Couder
2010-04-01merge: refactor code that calls "git merge-STRATEGY"Christian Couder
2010-03-29Merge branch 'cc/cherry-pick-ff'Junio C Hamano
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds