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 'bc/object-id'
Junio C Hamano
2017-04-19
|
\
|
*
Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZ
brian m. carlson
2017-03-26
*
|
Merge branch 'jc/merge-drop-old-syntax'
Junio C Hamano
2017-03-30
|
\
\
|
|
/
|
/
|
|
*
merge: drop 'git merge <message> HEAD <commit>' syntax
Junio C Hamano
2015-04-29
*
|
Merge branch 'bc/object-id'
Junio C Hamano
2017-03-17
|
\
\
|
*
|
builtin/merge: convert to struct object_id
brian m. carlson
2017-02-22
*
|
|
Merge branch 'jk/interpret-branch-name'
Junio C Hamano
2017-03-14
|
\
\
\
|
|
/
/
|
/
|
|
|
*
|
interpret_branch_name: allow callers to restrict expansions
Jeff King
2017-03-02
*
|
|
Merge branch 'cp/merge-continue'
Junio C Hamano
2016-12-27
|
\
\
\
|
*
|
|
merge: mark usage error strings for translation
Jeff King
2016-12-15
|
*
|
|
merge: ensure '--abort' option takes no arguments
Chris Packham
2016-12-14
|
*
|
|
merge: add '--continue' option as a synonym for 'git commit'
Chris Packham
2016-12-14
|
|
/
/
*
|
|
hold_locked_index(): align error handling with hold_lockfile_for_update()
Junio C Hamano
2016-12-07
|
/
/
*
|
find_unique_abbrev: use 4-buffer ring
Jeff King
2016-10-26
*
|
use strbuf_addstr() for adding constant strings to a strbuf, part 2
René Scharfe
2016-09-15
*
|
Merge branch 'rs/merge-add-strategies-simplification'
Junio C Hamano
2016-08-12
|
\
\
|
*
|
merge: use string_list_split() in add_strategies()
René Scharfe
2016-08-05
*
|
|
prepare the builtins for a libified merge_recursive()
Johannes Schindelin
2016-07-26
*
|
|
Merge branch 'jk/write-file'
Junio C Hamano
2016-07-19
|
\
\
\
|
*
|
|
use write_file_buf where applicable
Jeff King
2016-07-08
|
|
/
/
*
|
|
Merge branch 'bc/cocci'
Junio C Hamano
2016-07-19
|
\
\
\
|
*
|
|
coccinelle: apply object_id Coccinelle transformations
brian m. carlson
2016-06-28
|
*
|
|
coccinelle: convert hashcpy() with null_sha1 to hashclr()
brian m. carlson
2016-06-28
|
|
/
/
*
|
|
i18n: merge: change command option help to lowercase
Vasco Almeida
2016-06-17
*
|
|
i18n: merge: mark messages for translation
Vasco Almeida
2016-06-17
|
/
/
*
|
Merge branch 'en/merge-trivial-fix'
Junio C Hamano
2016-04-25
|
\
\
|
*
|
builtin/merge.c: fix a bug with trivial merges
Elijah Newren
2016-04-12
*
|
|
Merge branch 'dt/pre-refs-backend'
Junio C Hamano
2016-04-25
|
\
\
\
|
|
/
/
|
/
|
|
|
*
|
cmd_merge(): remove unneeded flag variable
Michael Haggerty
2016-04-10
*
|
|
Merge branch 'jc/merge-refuse-new-root'
Junio C Hamano
2016-04-08
|
\
\
\
|
*
|
|
merge: refuse to create too cool a merge by default
Junio C Hamano
2016-03-23
|
|
/
/
*
|
|
Merge branch 'jv/merge-nothing-into-void'
Junio C Hamano
2016-04-06
|
\
\
\
|
*
|
|
merge: fix NULL pointer dereference when merging nothing into void
Junio C Hamano
2016-03-23
|
|
/
/
*
|
|
Merge branch 'mm/diff-renames-default'
Junio C Hamano
2016-04-03
|
\
\
\
|
|
/
/
|
/
|
|
|
*
|
diff: activate diff.renames by default
Matthieu Moy
2016-02-25
*
|
|
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
[next]
