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
2018-09-21
diff.c: remove implicit dependency on the_index
Nguyễn Thái Ngọc Duy
1
-1
/
+1
2018-09-17
Merge branch 'jk/cocci'
Junio C Hamano
1
-3
/
+3
2018-09-17
Merge branch 'ds/reachable'
Junio C Hamano
1
-0
/
+1
2018-08-29
convert "oidcmp() != 0" to "!oideq()"
Jeff King
1
-1
/
+1
2018-08-29
convert "oidcmp() == 0" to oideq()
Jeff King
1
-2
/
+2
2018-08-15
Merge branch 'nd/i18n'
Junio C Hamano
1
-1
/
+1
2018-08-02
Merge branch 'js/rebase-merge-octopus'
Junio C Hamano
1
-0
/
+32
2018-08-02
Merge branch 'bc/object-id'
Junio C Hamano
1
-5
/
+6
2018-07-23
Update messages in preparation for i18n
Nguyễn Thái Ngọc Duy
1
-1
/
+1
2018-07-20
commit.h: remove method declarations
Derrick Stolee
1
-0
/
+1
2018-07-18
Merge branch 'sb/object-store-grafts'
Junio C Hamano
1
-18
/
+19
2018-07-16
builtin/merge: switch to use the_hash_algo
brian m. carlson
1
-5
/
+6
2018-07-11
merge: allow reading the merge commit message from a file
Johannes Schindelin
1
-0
/
+32
2018-06-29
Merge branch 'sb/object-store-grafts' into sb/object-store-lookup
Junio C Hamano
1
-18
/
+19
2018-06-25
Merge branch 'ds/commit-graph-lockfile-fix'
Junio C Hamano
1
-3
/
+4
2018-06-25
Merge branch 'nd/commit-util-to-slab'
Junio C Hamano
1
-12
/
+13
2018-06-01
Merge branch 'nd/use-opt-int-set-f'
Junio C Hamano
1
-3
/
+3
2018-06-01
Merge branch 'nd/command-list'
Junio C Hamano
1
-0
/
+1
2018-05-30
Merge branch 'bw/ref-prefix-for-configured-refspec'
Junio C Hamano
1
-0
/
+1
2018-05-30
Merge branch 'bc/object-id'
Junio C Hamano
1
-7
/
+7
2018-05-30
Merge branch 'ma/lockfile-cleanup'
Junio C Hamano
1
-2
/
+2
2018-05-24
Use OPT_SET_INT_F() for cmdline option specification
Nguyễn Thái Ngọc Duy
1
-3
/
+3
2018-05-22
merge: check config before loading commits
Derrick Stolee
1
-3
/
+4
2018-05-21
merge: use commit-slab in merge remote desc instead of commit->util
Nguyễn Thái Ngọc Duy
1
-12
/
+13
2018-05-21
Move declaration for alias.c to alias.h
Nguyễn Thái Ngọc Duy
1
-0
/
+1
2018-05-18
path.c: migrate global git_path_* to take a repository argument
Stefan Beller
1
-18
/
+19
2018-05-18
refspec: move refspec parsing logic into its own file
Brandon Williams
1
-0
/
+1
2018-05-10
lock_file: make function-local locks non-static
Martin Ågren
1
-2
/
+2
2018-05-02
builtin/merge: switch tree functions to use object_id
brian m. carlson
1
-7
/
+7
2018-04-11
Merge branch 'sb/object-store'
Junio C Hamano
1
-1
/
+1
2018-04-11
Merge branch 'bw/c-plus-plus' into ds/lazy-load-trees
Junio C Hamano
1
-1
/
+1
2018-04-10
Merge branch 'bc/object-id'
Junio C Hamano
1
-4
/
+4
2018-03-26
object-store: close all packs upon clearing the object store
Stefan Beller
1
-1
/
+1
2018-03-21
Merge branch 'ma/skip-writing-unchanged-index'
Junio C Hamano
1
-9
/
+6
2018-03-14
Convert find_unique_abbrev* to struct object_id
brian m. carlson
1
-3
/
+3
2018-03-14
cache-tree: convert write_*_as_tree to object_id
brian m. carlson
1
-1
/
+1
2018-03-06
Merge branch 'bw/c-plus-plus'
Junio C Hamano
1
-1
/
+1
2018-03-06
Merge branch 'jc/allow-ff-merging-kept-tags'
Junio C Hamano
1
-4
/
+39
2018-03-01
write_locked_index(): add flag to avoid writing unchanged index
Martin Ågren
1
-9
/
+6
2018-02-16
merge: allow fast-forward when merging a tracked tag
Junio C Hamano
1
-4
/
+39
2018-02-14
object: rename function 'typename' to 'type_name'
Brandon Williams
1
-1
/
+1
2018-01-30
commit: convert commit_tree* to object_id
Patryk Obara
1
-4
/
+4
2017-12-12
merge: add config option for verifySignatures
Hans Jerry Illikainen
1
-0
/
+2
2017-11-15
Merge branch 'ma/reduce-heads-leakfix'
Junio C Hamano
1
-0
/
+1
2017-11-08
reduce_heads: fix memory leaks
Martin Ågren
1
-0
/
+1
2017-10-16
refs: convert dwim_ref and expand_ref to struct object_id
brian m. carlson
1
-1
/
+1
2017-10-16
refs: convert resolve_refdup and refs_resolve_refdup to struct object_id
brian m. carlson
1
-1
/
+1
2017-10-16
refs: convert update_ref and refs_update_ref to use struct object_id
brian m. carlson
1
-7
/
+6
2017-09-19
Merge branch 'rs/strbuf-leakfix'
Junio C Hamano
1
-2
/
+7
2017-09-19
Merge branch 'sb/merge-commit-msg-hook'
Junio C Hamano
1
-0
/
+8
[prev]
[next]