summaryrefslogtreecommitdiff
path: root/builtin/merge.c
AgeCommit message (Expand)AuthorFilesLines
2011-02-15Merge branch 'maint'Libravatar Junio C Hamano1-2/+2
2011-02-15commit,merge,tag: describe -m likewiseLibravatar Michael J Gruber1-2/+2
2010-12-28cherry-pick/revert: add support for -X/--strategy-optionLibravatar Jonathan Nieder1-2/+4
2010-12-12Merge branch 'jn/git-cmd-h-bypass-setup'Libravatar Junio C Hamano1-0/+3
2010-12-08Merge branch 'jh/notes-merge'Libravatar Junio C Hamano1-16/+31
2010-11-24Merge branch 'cb/maint-orphan-merge-noclobber'Libravatar Junio C Hamano1-1/+19
2010-11-17Provide 'git merge --abort' as a synonym to 'git reset --merge'Libravatar Johan Herland1-0/+14
2010-11-17cmd_merge(): Parse options before checking MERGE_HEADLibravatar Johan Herland1-16/+17
2010-11-15do not overwrite untracked during merge from unborn branchLibravatar Clemens Buchacher1-1/+19
2010-11-03Change incorrect "remote branch" to "remote tracking branch" in C codeLibravatar Matthieu Moy1-1/+1
2010-10-26Merge branch 'jf/merge-ignore-ws'Libravatar Junio C Hamano1-18/+2
2010-10-22merge -h: show usage even with corrupt indexLibravatar Nguyễn Thái Ngọc Duy1-0/+2
2010-09-29Merge branch 'rr/fmt-merge-msg'Libravatar Junio C Hamano1-13/+19
2010-09-09merge: Make 'merge.log' an integer or boolean optionLibravatar Ramkumar Ramachandra1-1/+6
2010-09-09merge: Make '--log' an integer option for number of shortlog entriesLibravatar Ramkumar Ramachandra1-7/+10
2010-09-09fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_lenLibravatar Ramkumar Ramachandra1-8/+6
2010-09-03Merge branch 'dg/local-mod-error-messages'Libravatar Junio C Hamano1-2/+1
2010-09-03Merge branch 'jn/merge-custom-no-trivial'Libravatar Junio C Hamano1-0/+1
2010-09-03Merge branch 'jn/update-contrib-example-merge'Libravatar Junio C Hamano1-1/+1
2010-09-03Merge branch 'jn/merge-renormalize'Libravatar Junio C Hamano1-2/+14
2010-09-03Move "show_all_errors = 1" to setup_unpack_trees_porcelain()Libravatar Matthieu Moy1-1/+0
2010-09-03setup_unpack_trees_porcelain: take the whole options struct as parameterLibravatar Matthieu Moy1-1/+1
2010-09-03Move set_porcelain_error_msgs to unpack-trees.c and rename itLibravatar Matthieu Moy1-1/+1
2010-08-26merge-recursive: expose merge options for builtin mergeLibravatar Jonathan Nieder1-18/+2
2010-08-21Merge branch 'gb/split-cmdline-errmsg'Libravatar Junio C Hamano1-1/+2
2010-08-18merge: do not mistake (ancestor of) tag for branchLibravatar Jonathan Nieder1-1/+1
2010-08-15merge: let custom strategies intervene in trivial mergesLibravatar Jonathan Nieder1-0/+1
2010-08-11unpack_trees: group error messages by typeLibravatar Matthieu Moy1-0/+1
2010-08-11merge-recursive: porcelain messages for checkoutLibravatar Diane Gasselin1-1/+1
2010-08-11Turn unpack_trees_options.msgs into an array + enumLibravatar Matthieu Moy1-1/+1
2010-08-11split_cmdline: Allow caller to access error stringLibravatar Greg Brockman1-1/+2
2010-08-06merge-recursive --renormalizeLibravatar Jonathan Nieder1-5/+14
2010-07-02Avoid conflicts when merging branches with mixed normalizationLibravatar Eyvind Bernhardsen1-0/+3
2010-06-18Merge branch 'tc/merge-m-log'Libravatar Junio C Hamano1-8/+12
2010-05-10merge: --log appends shortlog to message if specifiedLibravatar Tay Ray Chuan1-7/+11
2010-05-10merge: rename variableLibravatar Tay Ray Chuan1-3/+3
2010-05-10merge: update commentLibravatar Tay Ray Chuan1-1/+1
2010-05-08Merge branch 'cc/revert-strategy'Libravatar Junio C Hamano1-36/+45
2010-04-01merge: make function try_merge_command non staticLibravatar Christian Couder1-2/+2
2010-04-01merge: refactor code that calls "git merge-STRATEGY"Libravatar Christian Couder1-36/+45
2010-03-28Merge branch 'cc/cherry-pick-ff'Libravatar Junio C Hamano1-1/+1
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLibravatar Linus Torvalds1-0/+1292
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 18:15:28 +0000