index
:
org/kernel/git.git
master
forked from git/git
git
about
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
builtin
/
merge.c
Commit message (
Expand
)
Author
Age
*
fmt-merge-msg: use branch.$name.description
Junio C Hamano
2011-10-07
*
Merge branch 'jk/color-and-pager'
Junio C Hamano
2011-08-28
|
\
|
*
want_color: automatically fallback to color.ui
Jeff King
2011-08-19
|
*
diff: refactor COLOR_DIFF from a flag into an int
Jeff King
2011-08-18
*
|
Merge branch 'jc/merge-reword'
Junio C Hamano
2011-08-25
|
\
\
|
|
/
|
/
|
|
*
merge: reword the final message
Junio C Hamano
2011-05-25
*
|
Merge branch 'jk/format-patch-am'
Junio C Hamano
2011-05-31
|
\
\
|
|
/
|
/
|
|
*
clean up calling conventions for pretty.c functions
Jeff King
2011-05-26
*
|
Merge branch 'jk/cherry-pick-root-with-resolve'
Junio C Hamano
2011-05-19
|
\
\
|
*
|
cherry-pick: handle root commits with external strategies
Jeff King
2011-05-16
*
|
|
Merge branch 'mg/merge-ff-config'
Junio C Hamano
2011-05-16
|
\
\
\
|
*
|
|
merge: introduce merge.ff configuration variable
Junio C Hamano
2011-05-06
|
*
|
|
Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config
Junio C Hamano
2011-05-06
|
|
/
/
*
|
|
Merge branch 'jc/maint-branch-mergeoptions'
Junio C Hamano
2011-05-11
*
|
|
Merge branch 'ab/i18n-fixup'
Junio C Hamano
2011-05-02
|
\
\
\
|
*
|
|
i18n: mark merge CHERRY_PICK_HEAD messages for translation
Ævar Arnfjörð Bjarmason
2011-04-12
|
*
|
|
i18n: mark merge "upstream" messages for translation
Ævar Arnfjörð Bjarmason
2011-04-12
|
*
|
|
i18n: mark merge "Could not read from" message for translation
Ævar Arnfjörð Bjarmason
2011-04-12
|
|
/
/
*
|
|
merge: allow "-" as a short-hand for "previous branch"
Junio C Hamano
2011-04-07
|
/
/
*
|
Merge branch 'jc/merge-sans-branch'
Junio C Hamano
2011-04-01
|
\
\
|
*
|
merge: merge with the default upstream branch without argument
Junio C Hamano
2011-03-24
|
*
|
merge: match the help text with the documentation
Jared Hance
2011-03-24
|
|
/
*
|
Merge branch 'ab/i18n-st'
Junio C Hamano
2011-04-01
|
\
\
|
*
|
i18n: git-merge "Wonderful" message
Ævar Arnfjörð Bjarmason
2011-03-09
|
*
|
i18n: git-merge "Updating %s..%s" message
Ævar Arnfjörð Bjarmason
2011-03-09
|
*
|
i18n: git-merge basic messages
Ævar Arnfjörð Bjarmason
2011-03-09
*
|
|
merge: merge unborn index before setting ref
Jeff King
2011-03-25
*
|
|
Merge branch 'jk/merge-rename-ux'
Junio C Hamano
2011-03-19
|
\
\
\
|
*
|
|
merge: enable progress reporting for rename detection
Jeff King
2011-02-21
|
|
|
/
|
|
/
|
*
|
|
Merge branch 'js/cherry-pick-usability'
Junio C Hamano
2011-03-09
|
\
\
\
|
*
|
|
Introduce CHERRY_PICK_HEAD
Jay Soffian
2011-02-21
|
|
/
/
*
|
|
Merge branch 'mg/placeholders-are-lowercase'
Junio C Hamano
2011-02-27
|
\
\
\
|
*
|
|
Make <identifier> lowercase as per CodingGuidelines
Michael J Gruber
2011-02-15
*
|
|
|
Merge branch 'js/maint-merge-use-prepare-commit-msg-hook'
Junio C Hamano
2011-02-27
|
\
\
\
\
|
|
_
|
_
|
/
|
/
|
|
|
|
*
|
|
merge: honor prepare-commit-msg hook
Jay Soffian
2011-02-15
|
|
|
/
|
|
/
|
*
|
|
Merge branch 'maint'
Junio C Hamano
2011-02-15
|
\
\
\
|
|
|
/
|
|
/
|
|
*
|
commit,merge,tag: describe -m likewise
Michael J Gruber
2011-02-15
|
|
/
*
|
cherry-pick/revert: add support for -X/--strategy-option
Jonathan Nieder
2010-12-28
|
/
*
Merge branch 'jn/git-cmd-h-bypass-setup'
Junio C Hamano
2010-12-12
|
\
|
*
merge -h: show usage even with corrupt index
Nguyễn Thái Ngọc Duy
2010-10-22
*
|
Merge branch 'jh/notes-merge'
Junio C Hamano
2010-12-08
|
\
\
|
*
|
Provide 'git merge --abort' as a synonym to 'git reset --merge'
Johan Herland
2010-11-17
|
*
|
cmd_merge(): Parse options before checking MERGE_HEAD
Johan Herland
2010-11-17
*
|
|
Merge branch 'cb/maint-orphan-merge-noclobber'
Junio C Hamano
2010-11-24
|
\
\
\
|
*
|
|
do not overwrite untracked during merge from unborn branch
Clemens Buchacher
2010-11-15
|
|
/
/
*
|
|
Change incorrect "remote branch" to "remote tracking branch" in C code
Matthieu Moy
2010-11-03
*
|
|
Merge branch 'jf/merge-ignore-ws'
Junio C Hamano
2010-10-26
|
\
\
\
|
*
|
|
merge-recursive: expose merge options for builtin merge
Jonathan Nieder
2010-08-26
*
|
|
|
Merge branch 'rr/fmt-merge-msg'
Junio C Hamano
2010-09-29
|
\
\
\
\
|
|
_
|
_
|
/
|
/
|
|
|
|
*
|
|
merge: Make 'merge.log' an integer or boolean option
Ramkumar Ramachandra
2010-09-09
[next]