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
*
Move "show_all_errors = 1" to setup_unpack_trees_porcelain()
Matthieu Moy
2010-09-03
*
setup_unpack_trees_porcelain: take the whole options struct as parameter
Matthieu Moy
2010-09-03
*
Move set_porcelain_error_msgs to unpack-trees.c and rename it
Matthieu Moy
2010-09-03
*
unpack_trees: group error messages by type
Matthieu Moy
2010-08-11
*
merge-recursive: porcelain messages for checkout
Diane Gasselin
2010-08-11
*
Turn unpack_trees_options.msgs into an array + enum
Matthieu Moy
2010-08-11
*
Merge branch 'tc/merge-m-log'
Junio C Hamano
2010-06-18
|
\
|
*
merge: --log appends shortlog to message if specified
Tay Ray Chuan
2010-05-10
|
*
merge: rename variable
Tay Ray Chuan
2010-05-10
|
*
merge: update comment
Tay Ray Chuan
2010-05-10
*
|
Merge branch 'cc/revert-strategy'
Junio C Hamano
2010-05-08
|
\
\
|
|
/
|
/
|
|
*
merge: make function try_merge_command non static
Christian Couder
2010-04-01
|
*
merge: refactor code that calls "git merge-STRATEGY"
Christian Couder
2010-04-01
*
|
Merge branch 'cc/cherry-pick-ff'
Junio C Hamano
2010-03-28
|
/
*
Move 'builtin-*' into a 'builtin/' subdirectory
Linus Torvalds
2010-02-22