index
:
git
master
git
Fast-forward packages
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
builtin-merge.c
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Merge branch 'cb/maint-no-double-merge'
Junio C Hamano
2009-06-13
1
-1
/
+4
|
\
|
*
refuse to merge during a merge
Clemens Buchacher
2009-06-02
1
-1
/
+4
*
|
parse-opts: prepare for OPT_FILENAME
Stephen Boyd
2009-05-25
1
-2
/
+2
|
/
*
Merge branch 'maint'
Junio C Hamano
2009-04-28
1
-1
/
+1
|
\
|
*
Merge branch 'maint-1.6.1' into maint
Junio C Hamano
2009-04-28
1
-1
/
+1
|
|
\
|
|
*
Merge branch 'maint-1.6.0' into maint-1.6.1
Junio C Hamano
2009-04-28
1
-1
/
+1
|
|
|
\
|
|
|
*
builtin-merge: fix a typo in an error message
Allan Caffee
2009-04-27
1
-1
/
+1
*
|
|
|
strbuf_branchname(): a wrapper for branch name shorthands
Junio C Hamano
2009-03-23
1
-3
/
+2
*
|
|
|
Rename interpret/substitute nth_last_branch functions
Junio C Hamano
2009-03-23
1
-1
/
+1
*
|
|
|
Turn the flags in struct dir_struct into a single variable
Johannes Schindelin
2009-02-18
1
-1
/
+1
|
/
/
/
*
|
|
Teach @{-1} to git merge
Junio C Hamano
2009-02-14
1
-3
/
+12
*
|
|
Replace deprecated dashed git commands in usage
Alexander Potashev
2009-02-05
1
-2
/
+2
*
|
|
Move run_hook() from builtin-commit.c into run-command.c (libgit)
Stephan Beyer
2009-01-18
1
-30
/
+1
|
/
/
*
|
Make some of fwrite/fclose/write/close failures visible
Alex Riesen
2008-12-05
1
-2
/
+4
*
|
Teach/Fix pull/fetch -q/-v options
Tuncer Ayaz
2008-11-15
1
-7
/
+14
*
|
Merge branch 'mv/merge-noff'
Junio C Hamano
2008-10-20
1
-0
/
+10
|
\
\
|
*
|
builtin-commit: use reduce_heads() only when appropriate
Miklos Vajna
2008-10-03
1
-0
/
+10
*
|
|
Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer
Brandon Casey
2008-10-12
1
-18
/
+9
*
|
|
Merge branch 'mv/merge-refresh'
Shawn O. Pearce
2008-10-09
1
-0
/
+10
|
\
\
\
|
*
|
|
builtin-merge: refresh the index before calling a strategy
Miklos Vajna
2008-10-03
1
-0
/
+10
|
|
/
/
*
|
|
Merge branch 'maint'
Shawn O. Pearce
2008-10-09
1
-2
/
+2
|
\
\
\
|
|
|
/
|
|
/
|
|
*
|
builtin-merge.c: allocate correct amount of memory
Brandon Casey
2008-10-09
1
-2
/
+2
*
|
|
Replace xmalloc/memset(0) pairs with xcalloc
Brandon Casey
2008-10-08
1
-2
/
+1
|
|
/
|
/
|
*
|
Merge branch 'mv/merge-recursive'
Shawn O. Pearce
2008-09-25
1
-29
/
+64
|
\
\
|
*
|
builtin-merge: release the lockfile in try_merge_strategy()
Miklos Vajna
2008-09-07
1
-0
/
+1
|
*
|
builtin-merge: avoid run_command_v_opt() for recursive and subtree
Miklos Vajna
2008-08-31
1
-29
/
+63
*
|
|
Merge branch 'mv/commit-tree'
Shawn O. Pearce
2008-09-25
1
-2
/
+2
|
\
\
\
|
*
|
|
commit_tree(): add a new author parameter
Miklos Vajna
2008-09-11
1
-2
/
+2
|
|
/
/
*
|
|
Merge branch 'maint'
Shawn O. Pearce
2008-09-25
1
-0
/
+2
|
\
\
\
|
|
/
/
|
/
|
/
|
|
/
|
*
maint: check return of split_cmdline to avoid bad config strings
Deskin Miller
2008-09-24
1
-0
/
+2
*
|
Remove useless memset of static command name lists in builtin-merge.c
Alex Riesen
2008-08-29
1
-2
/
+0
*
|
Remove calculation of the longest command name from where it is not used
Alex Riesen
2008-08-29
1
-4
/
+4
*
|
Merge branch 'mv/merge-custom'
Junio C Hamano
2008-08-28
1
-7
/
+43
|
\
\
|
*
|
Fix "git-merge -s bogo" help text
Junio C Hamano
2008-08-21
1
-3
/
+11
|
*
|
builtin-merge: allow using a custom strategy
Miklos Vajna
2008-07-30
1
-7
/
+35
*
|
|
Merge branch 'maint' to sync with 1.6.0.1
Junio C Hamano
2008-08-24
1
-7
/
+9
|
\
\
\
|
|
|
/
|
|
/
|
|
*
|
merge: fix numerus bugs around "trivial merge" area
Junio C Hamano
2008-08-24
1
-7
/
+9
*
|
|
provide more errors for the "merge into empty head" case
Paolo Bonzini
2008-08-22
1
-0
/
+5
|
/
/
*
|
"git-merge": allow fast-forwarding in a stat-dirty tree
Junio C Hamano
2008-08-21
1
-1
/
+1
*
|
Fix merge name generation in "merge in C"
Junio C Hamano
2008-07-30
1
-2
/
+2
|
/
*
Make non-static functions, that may be static, static
Stephan Beyer
2008-07-24
1
-1
/
+1
*
builtin-merge: add missing structure initialization
Pierre Habouzit
2008-07-22
1
-0
/
+1
*
builtin-merge: give a proper error message for invalid strategies in config
Miklos Vajna
2008-07-22
1
-25
/
+12
*
builtin-merge.c: Fix option parsing
Michele Ballabio
2008-07-20
1
-2
/
+3
*
Teach 'git merge' that some merge strategies no longer exist
Miklos Vajna
2008-07-20
1
-2
/
+0
*
Merge branch 'mv/merge-in-c'
Junio C Hamano
2008-07-16
1
-0
/
+1
*
Teach merge.log to "git-merge" again
Junio C Hamano
2008-07-10
1
-0
/
+2
*
Build in merge
Miklos Vajna
2008-07-08
1
-0
/
+1153
