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
*
use st_add and st_mult for allocation size computation
Jeff King
2016-02-22
*
merge: release pack files before garbage-collecting
Johannes Schindelin
2016-01-13
*
Remove get_object_hash.
brian m. carlson
2015-11-20
*
Convert struct object to object_id
brian m. carlson
2015-11-20
*
Add several uses of get_object_hash.
brian m. carlson
2015-11-20
*
Merge branch 'rs/pop-commit'
Junio C Hamano
2015-10-30
|
\
|
*
use pop_commit() for consuming the first entry of a struct commit_list
René Scharfe
2015-10-26
*
|
Merge branch 'tk/stripspace'
Junio C Hamano
2015-10-26
|
\
\
|
*
|
strbuf: make stripspace() part of strbuf
Tobias Klauser
2015-10-16
*
|
|
use sha1_to_hex_r() instead of strcpy
Jeff King
2015-10-05
|
/
/
*
|
memoize common git-path "constant" files
Jeff King
2015-08-10
|
/
*
Merge branch 'jk/at-push-sha1'
Junio C Hamano
2015-06-05
|
\
|
*
remote.c: drop "remote" pointer from "struct branch"
Jeff King
2015-05-21
*
|
Merge branch 'jc/merge'
Junio C Hamano
2015-05-19
|
\
\
|
*
|
merge: deprecate 'git merge <message> HEAD <commit>' syntax
Junio C Hamano
2015-04-29
|
*
|
merge: handle FETCH_HEAD internally
Junio C Hamano
2015-04-29
|
*
|
merge: decide if we auto-generate the message early in collect_parents()
Junio C Hamano
2015-04-29
|
*
|
merge: make collect_parents() auto-generate the merge message
Junio C Hamano
2015-04-29
|
*
|
merge: extract prepare_merge_message() logic out
Junio C Hamano
2015-04-29
|
*
|
merge: narrow scope of merge_names
Junio C Hamano
2015-04-29
|
*
|
merge: split reduce_parents() out of collect_parents()
Junio C Hamano
2015-04-29
|
*
|
merge: clarify collect_parents() logic
Junio C Hamano
2015-04-29
|
*
|
merge: small leakfix and code simplification
Junio C Hamano
2015-04-29
|
*
|
merge: do not check argc to determine number of remote heads
Junio C Hamano
2015-04-29
|
*
|
merge: clarify "pulling into void" special case
Junio C Hamano
2015-04-29
|
*
|
merge: simplify code flow
Junio C Hamano
2015-04-29
*
|
|
Revert "merge: pass verbosity flag down to merge-recursive"
Junio C Hamano
2015-04-16
*
|
|
Merge branch 'jk/merge-quiet'
Junio C Hamano
2015-04-14
|
\
\
\
|
|
_
|
/
|
/
|
|
|
*
|
merge: pass verbosity flag down to merge-recursive
Jeff King
2015-04-02
*
|
|
standardize usage info string format
Alex Henrie
2015-01-14
*
|
|
Merge branch 'rs/plug-strbuf-leak-in-merge'
Junio C Hamano
2015-01-12
|
\
\
\
|
*
|
|
merge: release strbuf after use in suggest_conflicts()
René Scharfe
2014-12-29
*
|
|
|
Merge branch 'jc/merge-bases'
Junio C Hamano
2015-01-07
|
\
\
\
\
|
|
/
/
/
|
/
|
|
|
|
*
|
|
get_merge_bases(): always clean-up object flags
Junio C Hamano
2014-10-30
|
|
/
/
*
|
|
Merge branch 'cc/interpret-trailers-more'
Junio C Hamano
2014-12-22
|
\
\
\
|
|
_
|
/
|
/
|
|
|
*
|
Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more
Junio C Hamano
2014-11-10
|
|
\
\
|
|
*
|
merge & sequencer: unify codepaths that write "Conflicts:" hint
Junio C Hamano
2014-10-24
|
|
*
|
builtin/merge.c: drop a parameter that is never used
Junio C Hamano
2014-10-24
*
|
|
|
refs.c: change resolve_ref_unsafe reading argument to be a flags field
Ronnie Sahlberg
2014-10-15
*
|
|
|
lockfile.h: extract new header file for the functions in lockfile.c
Michael Haggerty
2014-10-01
*
|
|
|
try_merge_strategy(): use a statically-allocated lock_file object
Michael Haggerty
2014-10-01
*
|
|
|
try_merge_strategy(): remove redundant lock_file allocation
Michael Haggerty
2014-10-01
*
|
|
|
Merge branch 'rs/realloc-array'
Junio C Hamano
2014-09-26
|
\
\
\
\
|
*
|
|
|
use REALLOC_ARRAY for changing the allocation size of arrays
René Scharfe
2014-09-18
|
|
/
/
/
*
|
|
|
Merge branch 'ah/grammofix'
Junio C Hamano
2014-09-19
|
\
\
\
\
|
|
/
/
/
|
/
|
|
|
|
*
|
|
grammofix in user-facing messages
Alex Henrie
2014-09-02
*
|
|
|
run-command: introduce CHILD_PROCESS_INIT
René Scharfe
2014-08-20
|
/
/
/
*
|
|
Merge branch 'rs/code-cleaning'
Junio C Hamano
2014-07-16
|
\
\
\
|
*
|
|
merge: simplify merge_trivial() by using commit_list_append()
René Scharfe
2014-07-10
*
|
|
|
Merge branch 'nd/split-index'
Junio C Hamano
2014-07-16
|
\
\
\
\
[next]
