aboutsummaryrefslogtreecommitdiff
path: root/builtin/merge.c
Commit message (Expand)AuthorAge
* Merge branch 'jk/format-patch-am'Junio C Hamano2011-05-31
|\
| * clean up calling conventions for pretty.c functionsJeff King2011-05-26
* | Merge branch 'jk/cherry-pick-root-with-resolve'Junio C Hamano2011-05-19
|\ \
| * | cherry-pick: handle root commits with external strategiesJeff King2011-05-16
* | | Merge branch 'mg/merge-ff-config'Junio C Hamano2011-05-16
|\ \ \
| * | | merge: introduce merge.ff configuration variableJunio C Hamano2011-05-06
| * | | Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-configJunio C Hamano2011-05-06
| |/ /
* | | Merge branch 'jc/maint-branch-mergeoptions'Junio C Hamano2011-05-11
* | | Merge branch 'ab/i18n-fixup'Junio C Hamano2011-05-02
|\ \ \
| * | | i18n: mark merge CHERRY_PICK_HEAD messages for translationÆvar Arnfjörð Bjarmason2011-04-12
| * | | i18n: mark merge "upstream" messages for translationÆvar Arnfjörð Bjarmason2011-04-12
| * | | i18n: mark merge "Could not read from" message for translationÆvar Arnfjörð Bjarmason2011-04-12
| |/ /
* | | merge: allow "-" as a short-hand for "previous branch"Junio C Hamano2011-04-07
|/ /
* | Merge branch 'jc/merge-sans-branch'Junio C Hamano2011-04-01
|\ \
| * | merge: merge with the default upstream branch without argumentJunio C Hamano2011-03-24
| * | merge: match the help text with the documentationJared Hance2011-03-24
| |/
* | Merge branch 'ab/i18n-st'Junio C Hamano2011-04-01
|\ \
| * | i18n: git-merge "Wonderful" messageÆvar Arnfjörð Bjarmason2011-03-09
| * | i18n: git-merge "Updating %s..%s" messageÆvar Arnfjörð Bjarmason2011-03-09
| * | i18n: git-merge basic messagesÆvar Arnfjörð Bjarmason2011-03-09
* | | merge: merge unborn index before setting refJeff King2011-03-25
* | | Merge branch 'jk/merge-rename-ux'Junio C Hamano2011-03-19
|\ \ \
| * | | merge: enable progress reporting for rename detectionJeff King2011-02-21
| | |/ | |/|
* | | Merge branch 'js/cherry-pick-usability'Junio C Hamano2011-03-09
|\ \ \
| * | | Introduce CHERRY_PICK_HEADJay Soffian2011-02-21
| |/ /
* | | Merge branch 'mg/placeholders-are-lowercase'Junio C Hamano2011-02-27
|\ \ \
| * | | Make <identifier> lowercase as per CodingGuidelinesMichael J Gruber2011-02-15
* | | | Merge branch 'js/maint-merge-use-prepare-commit-msg-hook'Junio C Hamano2011-02-27
|\ \ \ \ | |_|_|/ |/| | |
| * | | merge: honor prepare-commit-msg hookJay Soffian2011-02-15
| | |/ | |/|
* | | Merge branch 'maint'Junio C Hamano2011-02-15
|\ \ \ | | |/ | |/|
| * | commit,merge,tag: describe -m likewiseMichael J Gruber2011-02-15
| |/
* | cherry-pick/revert: add support for -X/--strategy-optionJonathan Nieder2010-12-28
|/
* Merge branch 'jn/git-cmd-h-bypass-setup'Junio C Hamano2010-12-12
|\
| * merge -h: show usage even with corrupt indexNguyễn Thái Ngọc Duy2010-10-22
* | Merge branch 'jh/notes-merge'Junio C Hamano2010-12-08
|\ \
| * | Provide 'git merge --abort' as a synonym to 'git reset --merge'Johan Herland2010-11-17
| * | cmd_merge(): Parse options before checking MERGE_HEADJohan Herland2010-11-17
* | | Merge branch 'cb/maint-orphan-merge-noclobber'Junio C Hamano2010-11-24
|\ \ \
| * | | do not overwrite untracked during merge from unborn branchClemens Buchacher2010-11-15
| |/ /
* | | Change incorrect "remote branch" to "remote tracking branch" in C codeMatthieu Moy2010-11-03
* | | Merge branch 'jf/merge-ignore-ws'Junio C Hamano2010-10-26
|\ \ \
| * | | merge-recursive: expose merge options for builtin mergeJonathan Nieder2010-08-26
* | | | Merge branch 'rr/fmt-merge-msg'Junio C Hamano2010-09-29
|\ \ \ \ | |_|_|/ |/| | |
| * | | merge: Make 'merge.log' an integer or boolean optionRamkumar Ramachandra2010-09-09
| * | | merge: Make '--log' an integer option for number of shortlog entriesRamkumar Ramachandra2010-09-09
| * | | fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_lenRamkumar Ramachandra2010-09-09
* | | | Merge branch 'dg/local-mod-error-messages'Junio C Hamano2010-09-03
|\ \ \ \
| * | | | Move "show_all_errors = 1" to setup_unpack_trees_porcelain()Matthieu Moy2010-09-03
| * | | | setup_unpack_trees_porcelain: take the whole options struct as parameterMatthieu Moy2010-09-03
| * | | | Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy2010-09-03