index
:
git
master
git
Fast-forward packages
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
merge-recursive.c
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Merge branch 'rs/pull-signed-tag'
Junio C Hamano
2016-08-20
1
-4
/
+1
|
\
|
*
merge-recursive: fix verbose output for multiple base trees
René Scharfe
2016-08-14
1
-4
/
+1
*
|
Merge branch 'rs/merge-recursive-string-list-init'
Junio C Hamano
2016-08-12
1
-2
/
+1
|
\
\
|
*
|
merge-recursive: use STRING_LIST_INIT_NODUP
René Scharfe
2016-08-06
1
-2
/
+1
|
|
/
*
|
merge-recursive: flush output buffer even when erroring out
Johannes Schindelin
2016-08-01
1
-1
/
+3
*
|
merge_trees(): ensure that the callers release output buffer
Johannes Schindelin
2016-08-01
1
-0
/
+2
*
|
merge-recursive: offer an option to retain the output in 'obuf'
Johannes Schindelin
2016-08-01
1
-4
/
+13
*
|
merge-recursive: write the commit title in one go
Johannes Schindelin
2016-08-01
1
-8
/
+9
*
|
merge-recursive: flush output buffer before printing error messages
Johannes Schindelin
2016-08-01
1
-48
/
+68
*
|
merge-recursive: switch to returning errors instead of dying
Johannes Schindelin
2016-07-26
1
-27
/
+35
*
|
merge-recursive: handle return values indicating errors
Johannes Schindelin
2016-07-26
1
-102
/
+150
*
|
merge-recursive: allow write_tree_from_memory() to error out
Johannes Schindelin
2016-07-26
1
-2
/
+2
*
|
merge-recursive: avoid returning a wholesale struct
Johannes Schindelin
2016-07-26
1
-50
/
+56
*
|
merge_recursive: abort properly upon errors
Johannes Schindelin
2016-07-26
1
-5
/
+12
*
|
merge-recursive: clarify code in was_tracked()
Johannes Schindelin
2016-07-26
1
-16
/
+14
*
|
die(_("BUG")): avoid translating bug messages
Johannes Schindelin
2016-07-26
1
-3
/
+3
*
|
die("bug"): report bugs consistently
Johannes Schindelin
2016-07-26
1
-8
/
+7
*
|
Merge branch 'jc/renormalize-merge-kill-safer-crlf'
Junio C Hamano
2016-07-25
1
-4
/
+13
|
\
\
|
*
|
merge: avoid "safer crlf" during recording of merge results
Junio C Hamano
2016-07-12
1
-4
/
+13
*
|
|
merge-recursive: convert merge_recursive_generic() to object_id
brian m. carlson
2016-06-28
1
-7
/
+7
*
|
|
merge-recursive: convert leaf functions to use struct object_id
brian m. carlson
2016-06-28
1
-118
/
+118
*
|
|
merge-recursive: convert struct merge_file_info to object_id
brian m. carlson
2016-06-28
1
-19
/
+20
*
|
|
merge-recursive: convert struct stage_data to use object_id
brian m. carlson
2016-06-28
1
-20
/
+18
*
|
|
diff: convert struct diff_filespec to struct object_id
brian m. carlson
2016-06-28
1
-49
/
+58
|
|
/
|
/
|
*
|
Merge branch 'bc/object-id'
Junio C Hamano
2016-05-06
1
-2
/
+2
|
\
\
|
*
|
match-trees: convert shift_tree() and shift_tree_by() to use object_id
brian m. carlson
2016-04-20
1
-2
/
+2
|
|
/
*
|
merge-recursive: do not check working copy when creating a virtual merge base
Elijah Newren
2016-04-13
1
-3
/
+3
*
|
merge-recursive: remove duplicate code
Elijah Newren
2016-04-13
1
-2
/
+0
|
/
*
merge-recursive: find-renames resets threshold
Felipe Gonçalves Assis
2016-02-24
1
-1
/
+3
*
merge-recursive: more consistent interface
Felipe Gonçalves Assis
2016-02-17
1
-1
/
+4
*
merge-recursive: option to disable renames
Felipe Gonçalves Assis
2016-02-17
1
-0
/
+7
*
Remove get_object_hash.
brian m. carlson
2015-11-20
1
-8
/
+8
*
Convert struct object to object_id
brian m. carlson
2015-11-20
1
-7
/
+7
*
Add several uses of get_object_hash.
brian m. carlson
2015-11-20
1
-8
/
+8
*
Merge branch 'jk/delete-modechange-conflict'
Junio C Hamano
2015-10-30
1
-2
/
+6
|
\
|
*
merge: detect delete/modechange conflict
Jeff King
2015-10-26
1
-2
/
+6
*
|
merge-recursive: convert malloc / strcpy to strbuf
Jeff King
2015-10-05
1
-9
/
+8
*
|
use file_exists() to check if a file exists in the worktree
René Scharfe
2015-05-20
1
-2
/
+1
*
|
merge-recursive: fix memleaks
Stefan Beller
2015-03-23
1
-0
/
+3
*
|
Merge branch 'jc/merge-bases'
Junio C Hamano
2015-01-07
1
-1
/
+1
|
\
\
|
*
|
get_merge_bases(): always clean-up object flags
Junio C Hamano
2014-10-30
1
-1
/
+1
|
*
|
Merge branch 'jk/commit-buffer-length' into maint
Junio C Hamano
2014-07-16
1
-2
/
+4
|
|
\
\
*
|
|
|
tree.c: update read_tree_recursive callback to pass strbuf as base
Nguyễn Thái Ngọc Duy
2014-12-01
1
-9
/
+6
|
|
_
|
/
|
/
|
|
*
|
|
Merge branch 'mh/lockfile'
Junio C Hamano
2014-10-14
1
-0
/
+1
|
\
\
\
|
*
|
|
lockfile.h: extract new header file for the functions in lockfile.c
Michael Haggerty
2014-10-01
1
-0
/
+1
*
|
|
|
Merge branch 'da/include-compat-util-first-in-c'
Junio C Hamano
2014-10-14
1
-1
/
+1
|
\
\
\
\
|
|
/
/
/
|
/
|
|
|
|
*
|
|
cleanups: ensure that git-compat-util.h is included first
David Aguilar
2014-09-15
1
-1
/
+1
*
|
|
|
Merge branch 'sb/merge-recursive-copy-paste-fix'
Junio C Hamano
2014-09-30
1
-5
/
+1
|
\
\
\
\
|
*
|
|
|
merge-recursive: remove stale commented debugging code
Stefan Beller
2014-09-23
1
-4
/
+0
|
*
|
|
|
merge-recursive: fix copy-paste mistake
Stefan Beller
2014-09-23
1
-1
/
+1
[next]