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 'bw/object-id'
Junio C Hamano
2017-06-19
1
-1
/
+1
|
\
|
*
diff-tree: convert diff_tree_sha1 to struct object_id
Brandon Williams
2017-06-05
1
-1
/
+1
*
|
Merge branch 'nd/fopen-errors'
Junio C Hamano
2017-06-13
1
-3
/
+1
|
\
\
|
|
/
|
/
|
|
*
use xfopen() in more places
Nguyễn Thái Ngọc Duy
2017-05-26
1
-3
/
+1
*
|
tree: convert parse_tree_indirect to struct object_id
brian m. carlson
2017-05-08
1
-3
/
+3
*
|
merge: convert checkout_fast_forward to struct object_id
brian m. carlson
2017-05-08
1
-2
/
+2
*
|
Convert lookup_commit* to struct object_id
brian m. carlson
2017-05-08
1
-1
/
+1
|
/
*
Merge branch 'bc/object-id'
Junio C Hamano
2017-04-20
1
-1
/
+1
|
\
|
*
Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZ
brian m. carlson
2017-03-27
1
-1
/
+1
*
|
Merge branch 'jc/merge-drop-old-syntax'
Junio C Hamano
2017-03-30
1
-50
/
+9
|
\
\
|
|
/
|
/
|
|
*
merge: drop 'git merge <message> HEAD <commit>' syntax
Junio C Hamano
2015-04-29
1
-50
/
+9
*
|
Merge branch 'bc/object-id'
Junio C Hamano
2017-03-17
1
-68
/
+66
|
\
\
|
*
|
builtin/merge: convert to struct object_id
brian m. carlson
2017-02-22
1
-68
/
+66
*
|
|
Merge branch 'jk/interpret-branch-name'
Junio C Hamano
2017-03-14
1
-1
/
+1
|
\
\
\
|
|
/
/
|
/
|
|
|
*
|
interpret_branch_name: allow callers to restrict expansions
Jeff King
2017-03-02
1
-1
/
+1
*
|
|
Merge branch 'cp/merge-continue'
Junio C Hamano
2016-12-27
1
-0
/
+25
|
\
\
\
|
*
|
|
merge: mark usage error strings for translation
Jeff King
2016-12-16
1
-2
/
+2
|
*
|
|
merge: ensure '--abort' option takes no arguments
Chris Packham
2016-12-14
1
-0
/
+4
|
*
|
|
merge: add '--continue' option as a synonym for 'git commit'
Chris Packham
2016-12-14
1
-0
/
+21
|
|
/
/
*
/
/
hold_locked_index(): align error handling with hold_lockfile_for_update()
Junio C Hamano
2016-12-07
1
-3
/
+3
|
/
/
*
|
find_unique_abbrev: use 4-buffer ring
Jeff King
2016-10-26
1
-6
/
+5
*
|
use strbuf_addstr() for adding constant strings to a strbuf, part 2
René Scharfe
2016-09-15
1
-1
/
+1
*
|
Merge branch 'rs/merge-add-strategies-simplification'
Junio C Hamano
2016-08-12
1
-34
/
+10
|
\
\
|
*
|
merge: use string_list_split() in add_strategies()
René Scharfe
2016-08-06
1
-34
/
+10
*
|
|
prepare the builtins for a libified merge_recursive()
Johannes Schindelin
2016-07-26
1
-0
/
+2
*
|
|
Merge branch 'jk/write-file'
Junio C Hamano
2016-07-19
1
-40
/
+5
|
\
\
\
|
*
|
|
use write_file_buf where applicable
Jeff King
2016-07-08
1
-40
/
+5
|
|
/
/
*
|
|
Merge branch 'bc/cocci'
Junio C Hamano
2016-07-19
1
-8
/
+7
|
\
\
\
|
*
|
|
coccinelle: apply object_id Coccinelle transformations
brian m. carlson
2016-06-28
1
-7
/
+6
|
*
|
|
coccinelle: convert hashcpy() with null_sha1 to hashclr()
brian m. carlson
2016-06-28
1
-1
/
+1
|
|
/
/
*
|
|
i18n: merge: change command option help to lowercase
Vasco Almeida
2016-06-18
1
-1
/
+1
*
|
|
i18n: merge: mark messages for translation
Vasco Almeida
2016-06-18
1
-5
/
+5
|
/
/
*
|
Merge branch 'en/merge-trivial-fix'
Junio C Hamano
2016-04-26
1
-0
/
+8
|
\
\
|
*
|
builtin/merge.c: fix a bug with trivial merges
Elijah Newren
2016-04-13
1
-0
/
+8
*
|
|
Merge branch 'dt/pre-refs-backend'
Junio C Hamano
2016-04-26
1
-2
/
+2
|
\
\
\
|
|
/
/
|
/
|
|
|
*
|
cmd_merge(): remove unneeded flag variable
Michael Haggerty
2016-04-10
1
-2
/
+2
*
|
|
Merge branch 'jc/merge-refuse-new-root'
Junio C Hamano
2016-04-08
1
-3
/
+9
|
\
\
\
|
*
|
|
merge: refuse to create too cool a merge by default
Junio C Hamano
2016-03-23
1
-3
/
+9
|
|
/
/
*
|
|
Merge branch 'jv/merge-nothing-into-void'
Junio C Hamano
2016-04-06
1
-5
/
+5
|
\
\
\
|
*
|
|
merge: fix NULL pointer dereference when merging nothing into void
Junio C Hamano
2016-03-23
1
-5
/
+5
|
|
/
/
*
|
|
Merge branch 'mm/diff-renames-default'
Junio C Hamano
2016-04-03
1
-0
/
+1
|
\
\
\
|
|
/
/
|
/
|
|
|
*
|
diff: activate diff.renames by default
Matthieu Moy
2016-02-25
1
-0
/
+1
*
|
|
use st_add and st_mult for allocation size computation
Jeff King
2016-02-22
1
-1
/
+1
|
/
/
*
|
merge: release pack files before garbage-collecting
Johannes Schindelin
2016-01-13
1
-0
/
+1
*
|
Remove get_object_hash.
brian m. carlson
2015-11-20
1
-25
/
+25
*
|
Convert struct object to object_id
brian m. carlson
2015-11-20
1
-5
/
+5
*
|
Add several uses of get_object_hash.
brian m. carlson
2015-11-20
1
-27
/
+27
*
|
Merge branch 'rs/pop-commit'
Junio C Hamano
2015-10-30
1
-7
/
+5
|
\
\
|
*
|
use pop_commit() for consuming the first entry of a struct commit_list
René Scharfe
2015-10-26
1
-7
/
+5
*
|
|
Merge branch 'tk/stripspace'
Junio C Hamano
2015-10-26
1
-1
/
+1
|
\
\
\
[next]