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
*
Merge branch 'jc/rerere'
Junio C Hamano
2010-01-18
|
\
|
*
Teach --[no-]rerere-autoupdate option to merge, revert and friends
Junio C Hamano
2009-12-04
*
|
Revert recent "git merge <msg> HEAD <commit>..." deprecation
Junio C Hamano
2009-12-08
|
/
*
Merge branch 'maint'
Junio C Hamano
2009-12-02
|
\
|
*
merge: do not add standard message when message is given with -m option
Junio C Hamano
2009-12-02
|
*
Do not misidentify "git merge foo HEAD" as an old-style invocation
Junio C Hamano
2009-12-02
*
|
Merge branch 'jc/deprecate-old-syntax-from-merge'
Junio C Hamano
2009-12-01
|
\
\
|
*
|
git-merge: a deprecation notice of the ancient command line syntax
Junio C Hamano
2009-12-01
*
|
|
Merge branch 'mm/maint-merge-ff-error-message-fix'
Junio C Hamano
2009-11-30
|
\
\
\
|
*
|
|
builtin-merge: show user-friendly error messages for fast-forward too.
Matthieu Moy
2009-11-29
|
|
/
/
*
|
|
Merge branch 'ap/maint-merge-strategy-list-fix'
Junio C Hamano
2009-11-30
|
\
\
\
|
*
|
|
builtin-merge.c: call exclude_cmds() correctly.
Avery Pennarun
2009-11-29
|
|
/
/
*
|
|
Merge branch 'fc/doc-fast-forward'
Junio C Hamano
2009-11-15
|
\
\
\
|
*
|
|
Use 'fast-forward' all over the place
Felipe Contreras
2009-10-24
|
|
/
/
*
|
|
Merge branch 'maint'
Junio C Hamano
2009-11-10
|
\
\
\
|
|
|
/
|
|
/
|
|
*
|
merge: do not setup worktree twice
Jonathan Nieder
2009-11-10
|
|
/
*
|
Merge branch 'bg/merge-ff-only'
Junio C Hamano
2009-11-10
|
\
\
|
*
|
Teach 'git merge' and 'git pull' the option --ff-only
Björn Gustavsson
2009-10-30
|
|
/
*
|
Refactor pretty_print_commit arguments into a struct
Thomas Rast
2009-10-19
|
/
*
Merge branch 'jk/maint-merge-msg-fix'
Junio C Hamano
2009-08-16
|
\
|
*
merge: indicate remote tracking branches in merge message
Jeff King
2009-08-09
|
*
merge: fix incorrect merge message for ambiguous tag/branch
Jeff King
2009-08-09
*
|
Merge branch 'js/run-command-updates'
Junio C Hamano
2009-08-10
|
\
\
|
|
/
|
/
|
|
*
run_command: return exit code as positive value
Johannes Sixt
2009-07-05
*
|
Merge branch 'tr/die_errno'
Junio C Hamano
2009-07-06
|
\
\
|
|
/
|
/
|
|
*
Use die_errno() instead of die() when checking syscalls
Thomas Rast
2009-06-27
|
*
Convert existing die(..., strerror(errno)) to die_errno()
Thomas Rast
2009-06-27
*
|
Fix various sparse warnings in the git source code
Linus Torvalds
2009-06-20
*
|
Merge branch 'cb/maint-no-double-merge'
Junio C Hamano
2009-06-13
|
\
\
|
|
/
|
/
|
|
*
refuse to merge during a merge
Clemens Buchacher
2009-06-01
*
|
parse-opts: prepare for OPT_FILENAME
Stephen Boyd
2009-05-25
|
/
*
Merge branch 'maint'
Junio C Hamano
2009-04-28
|
\
|
*
Merge branch 'maint-1.6.1' into maint
Junio C Hamano
2009-04-28
|
|
\
|
|
*
Merge branch 'maint-1.6.0' into maint-1.6.1
Junio C Hamano
2009-04-28
|
|
|
\
|
|
|
*
builtin-merge: fix a typo in an error message
Allan Caffee
2009-04-27
*
|
|
|
strbuf_branchname(): a wrapper for branch name shorthands
Junio C Hamano
2009-03-22
*
|
|
|
Rename interpret/substitute nth_last_branch functions
Junio C Hamano
2009-03-22
*
|
|
|
Turn the flags in struct dir_struct into a single variable
Johannes Schindelin
2009-02-18
|
/
/
/
*
|
|
Teach @{-1} to git merge
Junio C Hamano
2009-02-13
*
|
|
Replace deprecated dashed git commands in usage
Alexander Potashev
2009-02-04
*
|
|
Move run_hook() from builtin-commit.c into run-command.c (libgit)
Stephan Beyer
2009-01-17
|
/
/
*
|
Make some of fwrite/fclose/write/close failures visible
Alex Riesen
2008-12-04
*
|
Teach/Fix pull/fetch -q/-v options
Tuncer Ayaz
2008-11-14
*
|
Merge branch 'mv/merge-noff'
Junio C Hamano
2008-10-19
|
\
\
|
*
|
builtin-commit: use reduce_heads() only when appropriate
Miklos Vajna
2008-10-03
*
|
|
Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer
Brandon Casey
2008-10-12
*
|
|
Merge branch 'mv/merge-refresh'
Shawn O. Pearce
2008-10-09
|
\
\
\
|
*
|
|
builtin-merge: refresh the index before calling a strategy
Miklos Vajna
2008-10-03
|
|
/
/
*
|
|
Merge branch 'maint'
Shawn O. Pearce
2008-10-09
|
\
\
\
|
|
|
/
|
|
/
|
|
*
|
builtin-merge.c: allocate correct amount of memory
Brandon Casey
2008-10-09
[next]