summaryrefslogtreecommitdiff
path: root/builtin/merge.c
AgeCommit message (Expand)AuthorFilesLines
2011-10-05Merge branch 'jc/want-commit'Libravatar Junio C Hamano1-5/+14
2011-09-15Allow git merge ":/<pattern>"Libravatar Junio C Hamano1-5/+14
2011-08-28Merge branch 'jk/color-and-pager'Libravatar Junio C Hamano1-6/+0
2011-08-25Merge branch 'jc/merge-reword'Libravatar Junio C Hamano1-1/+1
2011-08-19want_color: automatically fallback to color.uiLibravatar Jeff King1-4/+0
2011-08-18diff: refactor COLOR_DIFF from a flag into an intLibravatar Jeff King1-2/+0
2011-05-31Merge branch 'jk/format-patch-am'Libravatar Junio C Hamano1-1/+2
2011-05-26clean up calling conventions for pretty.c functionsLibravatar Jeff King1-1/+2
2011-05-25merge: reword the final messageLibravatar Junio C Hamano1-1/+1
2011-05-19Merge branch 'jk/cherry-pick-root-with-resolve'Libravatar Junio C Hamano1-2/+10
2011-05-16Merge branch 'mg/merge-ff-config'Libravatar Junio C Hamano1-0/+9
2011-05-16cherry-pick: handle root commits with external strategiesLibravatar Jeff King1-2/+10
2011-05-11Merge branch 'jc/maint-branch-mergeoptions'Libravatar Junio C Hamano1-15/+26
2011-05-06merge: introduce merge.ff configuration variableLibravatar Junio C Hamano1-0/+9
2011-05-06Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-configLibravatar Junio C Hamano1-15/+26
2011-05-02Merge branch 'ab/i18n-fixup'Libravatar Junio C Hamano1-8/+8
2011-04-12i18n: mark merge CHERRY_PICK_HEAD messages for translationLibravatar Ævar Arnfjörð Bjarmason1-3/+3
2011-04-12i18n: mark merge "upstream" messages for translationLibravatar Ævar Arnfjörð Bjarmason1-4/+4
2011-04-12i18n: mark merge "Could not read from" message for translationLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2011-04-07merge: allow "-" as a short-hand for "previous branch"Libravatar Junio C Hamano1-3/+6
2011-04-01Merge branch 'jc/merge-sans-branch'Libravatar Junio C Hamano1-2/+40
2011-04-01Merge branch 'ab/i18n-st'Libravatar Junio C Hamano1-64/+64
2011-03-25merge: merge unborn index before setting refLibravatar Jeff King1-1/+1
2011-03-24merge: merge with the default upstream branch without argumentLibravatar Junio C Hamano1-1/+38
2011-03-24merge: match the help text with the documentationLibravatar Jared Hance1-2/+3
2011-03-19Merge branch 'jk/merge-rename-ux'Libravatar Junio C Hamano1-0/+7
2011-03-09i18n: git-merge "Wonderful" messageLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2011-03-09i18n: git-merge "Updating %s..%s" messageLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2011-03-09i18n: git-merge basic messagesLibravatar Ævar Arnfjörð Bjarmason1-62/+62
2011-03-09Merge branch 'js/cherry-pick-usability'Libravatar Junio C Hamano1-0/+7
2011-02-27Merge branch 'mg/placeholders-are-lowercase'Libravatar Junio C Hamano1-1/+1
2011-02-27Merge branch 'js/maint-merge-use-prepare-commit-msg-hook'Libravatar Junio C Hamano1-8/+29
2011-02-21Introduce CHERRY_PICK_HEADLibravatar Jay Soffian1-0/+7
2011-02-21merge: enable progress reporting for rename detectionLibravatar Jeff King1-0/+7
2011-02-15merge: honor prepare-commit-msg hookLibravatar Jay Soffian1-8/+29
2011-02-15Make <identifier> lowercase as per CodingGuidelinesLibravatar Michael J Gruber1-1/+1
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-31 11:23:02 +0000