summaryrefslogtreecommitdiff
path: root/builtin/merge.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mg/merge-ff-config'Junio C Hamano2011-05-161-0/+9
|\
| * merge: introduce merge.ff configuration variableJunio C Hamano2011-05-061-0/+9
| * Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-configJunio C Hamano2011-05-061-15/+26
* | Merge branch 'jc/maint-branch-mergeoptions'Junio C Hamano2011-05-111-15/+26
* | Merge branch 'ab/i18n-fixup'Junio C Hamano2011-05-021-8/+8
|\ \
| * | i18n: mark merge CHERRY_PICK_HEAD messages for translationÆvar Arnfjörð Bjarmason2011-04-121-3/+3
| * | i18n: mark merge "upstream" messages for translationÆvar Arnfjörð Bjarmason2011-04-121-4/+4
| * | i18n: mark merge "Could not read from" message for translationÆvar Arnfjörð Bjarmason2011-04-121-1/+1
| |/
* | merge: allow "-" as a short-hand for "previous branch"Junio C Hamano2011-04-071-3/+6
|/
* Merge branch 'jc/merge-sans-branch'Junio C Hamano2011-04-011-2/+40
|\
| * merge: merge with the default upstream branch without argumentJunio C Hamano2011-03-241-1/+38
| * merge: match the help text with the documentationJared Hance2011-03-241-2/+3
* | Merge branch 'ab/i18n-st'Junio C Hamano2011-04-011-64/+64
|\ \
| * | i18n: git-merge "Wonderful" messageÆvar Arnfjörð Bjarmason2011-03-091-1/+1
| * | i18n: git-merge "Updating %s..%s" messageÆvar Arnfjörð Bjarmason2011-03-091-1/+1
| * | i18n: git-merge basic messagesÆvar Arnfjörð Bjarmason2011-03-091-62/+62
* | | merge: merge unborn index before setting refJeff King2011-03-251-1/+1
* | | Merge branch 'jk/merge-rename-ux'Junio C Hamano2011-03-191-0/+7
|\ \ \
| * | | merge: enable progress reporting for rename detectionJeff King2011-02-211-0/+7
| | |/ | |/|
* | | Merge branch 'js/cherry-pick-usability'Junio C Hamano2011-03-091-0/+7
|\ \ \
| * | | Introduce CHERRY_PICK_HEADJay Soffian2011-02-211-0/+7
| |/ /
* | | Merge branch 'mg/placeholders-are-lowercase'Junio C Hamano2011-02-271-1/+1
|\ \ \
| * | | Make <identifier> lowercase as per CodingGuidelinesMichael J Gruber2011-02-151-1/+1
* | | | Merge branch 'js/maint-merge-use-prepare-commit-msg-hook'Junio C Hamano2011-02-271-8/+29
|\ \ \ \ | |_|_|/ |/| | |
| * | | merge: honor prepare-commit-msg hookJay Soffian2011-02-151-8/+29
| | |/ | |/|
* | | Merge branch 'maint'Junio C Hamano2011-02-151-2/+2
|\ \ \ | | |/ | |/|
| * | commit,merge,tag: describe -m likewiseMichael J Gruber2011-02-151-2/+2
| |/
* | cherry-pick/revert: add support for -X/--strategy-optionJonathan Nieder2010-12-281-2/+4
|/
* Merge branch 'jn/git-cmd-h-bypass-setup'Junio C Hamano2010-12-121-0/+3
|\
| * merge -h: show usage even with corrupt indexNguyễn Thái Ngọc Duy2010-10-221-0/+2
* | Merge branch 'jh/notes-merge'Junio C Hamano2010-12-081-16/+31
|\ \
| * | Provide 'git merge --abort' as a synonym to 'git reset --merge'Johan Herland2010-11-171-0/+14
| * | cmd_merge(): Parse options before checking MERGE_HEADJohan Herland2010-11-171-16/+17
* | | Merge branch 'cb/maint-orphan-merge-noclobber'Junio C Hamano2010-11-241-1/+19
|\ \ \
| * | | do not overwrite untracked during merge from unborn branchClemens Buchacher2010-11-151-1/+19
| |/ /
* | | Change incorrect "remote branch" to "remote tracking branch" in C codeMatthieu Moy2010-11-031-1/+1
* | | Merge branch 'jf/merge-ignore-ws'Junio C Hamano2010-10-261-18/+2
|\ \ \
| * | | merge-recursive: expose merge options for builtin mergeJonathan Nieder2010-08-261-18/+2
* | | | Merge branch 'rr/fmt-merge-msg'Junio C Hamano2010-09-291-13/+19
|\ \ \ \ | |_|_|/ |/| | |
| * | | merge: Make 'merge.log' an integer or boolean optionRamkumar Ramachandra2010-09-091-1/+6
| * | | merge: Make '--log' an integer option for number of shortlog entriesRamkumar Ramachandra2010-09-091-7/+10
| * | | fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_lenRamkumar Ramachandra2010-09-091-8/+6
* | | | Merge branch 'dg/local-mod-error-messages'Junio C Hamano2010-09-031-2/+1
|\ \ \ \
| * | | | Move "show_all_errors = 1" to setup_unpack_trees_porcelain()Matthieu Moy2010-09-031-1/+0
| * | | | setup_unpack_trees_porcelain: take the whole options struct as parameterMatthieu Moy2010-09-031-1/+1
| * | | | Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy2010-09-031-1/+1
* | | | | Merge branch 'jn/merge-custom-no-trivial'Junio C Hamano2010-09-031-0/+1
|\ \ \ \ \
| * | | | | merge: let custom strategies intervene in trivial mergesJonathan Nieder2010-08-151-0/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jn/update-contrib-example-merge'Junio C Hamano2010-09-031-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | merge: do not mistake (ancestor of) tag for branchJonathan Nieder2010-08-181-1/+1
| |/ / /
View Lorry Controller Status