summaryrefslogtreecommitdiff
path: root/builtin/merge.c
AgeCommit message (Expand)Author
2011-05-31Merge branch 'jk/format-patch-am'Junio C Hamano
2011-05-26clean up calling conventions for pretty.c functionsJeff King
2011-05-20Merge branch 'jk/cherry-pick-root-with-resolve'Junio C Hamano
2011-05-16Merge branch 'mg/merge-ff-config'Junio C Hamano
2011-05-16cherry-pick: handle root commits with external strategiesJeff King
2011-05-11Merge branch 'jc/maint-branch-mergeoptions'Junio C Hamano
2011-05-06merge: introduce merge.ff configuration variableJunio C Hamano
2011-05-06Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-configJunio C Hamano
2011-05-02Merge branch 'ab/i18n-fixup'Junio C Hamano
2011-04-12i18n: mark merge CHERRY_PICK_HEAD messages for translationÆvar Arnfjörð Bjarmason
2011-04-12i18n: mark merge "upstream" messages for translationÆvar Arnfjörð Bjarmason
2011-04-12i18n: mark merge "Could not read from" message for translationÆvar Arnfjörð Bjarmason
2011-04-07merge: allow "-" as a short-hand for "previous branch"Junio C Hamano
2011-04-02Merge branch 'jc/merge-sans-branch'Junio C Hamano
2011-04-02Merge branch 'ab/i18n-st'Junio C Hamano
2011-03-25merge: merge unborn index before setting refJeff King
2011-03-24merge: merge with the default upstream branch without argumentJunio C Hamano
2011-03-24merge: match the help text with the documentationJared Hance
2011-03-20Merge branch 'jk/merge-rename-ux'Junio C Hamano
2011-03-10i18n: git-merge "Wonderful" messageÆvar Arnfjörð Bjarmason
2011-03-10i18n: git-merge "Updating %s..%s" messageÆvar Arnfjörð Bjarmason
2011-03-10i18n: git-merge basic messagesÆvar Arnfjörð Bjarmason
2011-03-09Merge branch 'js/cherry-pick-usability'Junio C Hamano
2011-02-28Merge branch 'mg/placeholders-are-lowercase'Junio C Hamano
2011-02-28Merge branch 'js/maint-merge-use-prepare-commit-msg-hook'Junio C Hamano
2011-02-22Introduce CHERRY_PICK_HEADJay Soffian
2011-02-21merge: enable progress reporting for rename detectionJeff King
2011-02-15merge: honor prepare-commit-msg hookJay Soffian
2011-02-15Make <identifier> lowercase as per CodingGuidelinesMichael J Gruber
2011-02-15Merge branch 'maint'Junio C Hamano
2011-02-15commit,merge,tag: describe -m likewiseMichael J Gruber
2010-12-28cherry-pick/revert: add support for -X/--strategy-optionJonathan Nieder
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
generated by cgit v0.10.2-6-g49f6 at 2024-04-16 15:20:59 (GMT)