index
:
tgif.git
2.36
Terin's Improved Git Fork
terinjokes@gmail.com
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
builtin
/
merge.c
Age
Commit message (
Expand
)
Author
Files
Lines
2017-09-10
Merge branch 'ma/up-to-date'
Junio C Hamano
1
-2
/
+2
2017-09-08
builtin/merge: honor commit-msg hook for merges
Stefan Beller
1
-0
/
+8
2017-09-07
merge: release strbuf after use in write_merge_heads()
Rene Scharfe
1
-0
/
+1
2017-09-07
merge: release strbuf after use in save_state()
Rene Scharfe
1
-2
/
+6
2017-08-26
Merge branch 'mg/killed-merge'
Junio C Hamano
1
-3
/
+12
2017-08-26
Merge branch 'jt/packmigrate'
Junio C Hamano
1
-0
/
+1
2017-08-24
Merge branch 'lg/merge-signoff'
Junio C Hamano
1
-0
/
+4
2017-08-23
pack: move pack-closing functions
Jonathan Tan
1
-0
/
+1
2017-08-23
treewide: correct several "up-to-date" to "up to date"
Martin Ågren
1
-2
/
+2
2017-08-23
merge: save merge state earlier
Michael J Gruber
1
-0
/
+2
2017-08-23
merge: split write_merge_state in two
Michael J Gruber
1
-3
/
+8
2017-08-23
merge: clarify call chain
Michael J Gruber
1
-0
/
+2
2017-08-22
Merge branch 'rs/merge-microcleanup'
Junio C Hamano
1
-2
/
+2
2017-08-22
Merge branch 'ma/parse-maybe-bool'
Junio C Hamano
1
-2
/
+2
2017-08-10
merge: use skip_prefix()
René Scharfe
1
-2
/
+2
2017-08-07
treewide: deprecate git_config_maybe_bool, use git_parse_maybe_bool
Martin Ågren
1
-2
/
+2
2017-07-25
merge: add a --signoff flag
Łukasz Gryglicki
1
-0
/
+4
2017-07-17
use MOVE_ARRAY
René Scharfe
1
-1
/
+1
2017-06-24
Merge branch 'bw/config-h'
Junio C Hamano
1
-0
/
+1
2017-06-19
Merge branch 'bw/object-id'
Junio C Hamano
1
-1
/
+1
2017-06-15
config: don't include config.h by default
Brandon Williams
1
-0
/
+1
2017-06-13
Merge branch 'nd/fopen-errors'
Junio C Hamano
1
-3
/
+1
2017-06-05
diff-tree: convert diff_tree_sha1 to struct object_id
Brandon Williams
1
-1
/
+1
2017-05-26
use xfopen() in more places
Nguyễn Thái Ngọc Duy
1
-3
/
+1
2017-05-08
tree: convert parse_tree_indirect to struct object_id
brian m. carlson
1
-3
/
+3
2017-05-08
merge: convert checkout_fast_forward to struct object_id
brian m. carlson
1
-2
/
+2
2017-05-08
Convert lookup_commit* to struct object_id
brian m. carlson
1
-1
/
+1
2017-04-19
Merge branch 'bc/object-id'
Junio C Hamano
1
-1
/
+1
2017-03-30
Merge branch 'jc/merge-drop-old-syntax'
Junio C Hamano
1
-50
/
+9
2017-03-26
Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZ
brian m. carlson
1
-1
/
+1
2017-03-17
Merge branch 'bc/object-id'
Junio C Hamano
1
-68
/
+66
2017-03-14
Merge branch 'jk/interpret-branch-name'
Junio C Hamano
1
-1
/
+1
2017-03-02
interpret_branch_name: allow callers to restrict expansions
Jeff King
1
-1
/
+1
2017-02-22
builtin/merge: convert to struct object_id
brian m. carlson
1
-68
/
+66
2016-12-27
Merge branch 'cp/merge-continue'
Junio C Hamano
1
-0
/
+25
2016-12-15
merge: mark usage error strings for translation
Jeff King
1
-2
/
+2
2016-12-14
merge: ensure '--abort' option takes no arguments
Chris Packham
1
-0
/
+4
2016-12-14
merge: add '--continue' option as a synonym for 'git commit'
Chris Packham
1
-0
/
+21
2016-12-07
hold_locked_index(): align error handling with hold_lockfile_for_update()
Junio C Hamano
1
-3
/
+3
2016-10-26
find_unique_abbrev: use 4-buffer ring
Jeff King
1
-6
/
+5
2016-09-15
use strbuf_addstr() for adding constant strings to a strbuf, part 2
René Scharfe
1
-1
/
+1
2016-08-12
Merge branch 'rs/merge-add-strategies-simplification'
Junio C Hamano
1
-34
/
+10
2016-08-05
merge: use string_list_split() in add_strategies()
René Scharfe
1
-34
/
+10
2016-07-26
prepare the builtins for a libified merge_recursive()
Johannes Schindelin
1
-0
/
+2
2016-07-19
Merge branch 'jk/write-file'
Junio C Hamano
1
-40
/
+5
2016-07-19
Merge branch 'bc/cocci'
Junio C Hamano
1
-8
/
+7
2016-07-08
use write_file_buf where applicable
Jeff King
1
-40
/
+5
2016-06-28
coccinelle: apply object_id Coccinelle transformations
brian m. carlson
1
-7
/
+6
2016-06-28
coccinelle: convert hashcpy() with null_sha1 to hashclr()
brian m. carlson
1
-1
/
+1
2016-06-17
i18n: merge: change command option help to lowercase
Vasco Almeida
1
-1
/
+1
[prev]
[next]