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
/
merge.c
Age
Commit message (
Expand
)
Author
Files
Lines
2018-09-21
merge.c: remove implicit dependency on the_index
Nguyễn Thái Ngọc Duy
1
-9
/
+11
2018-08-02
Merge branch 'en/dirty-merge-fixes'
Junio C Hamano
1
-31
/
+0
2018-07-03
read-cache.c: move index_has_changes() from merge.c
Elijah Newren
1
-31
/
+0
2018-05-30
Merge branch 'ma/unpack-trees-free-msgs'
Junio C Hamano
1
-15
/
+20
2018-05-22
unpack_trees_options: free messages when done
Martin Ågren
1
-0
/
+3
2018-05-21
merge: setup `opts` later in `checkout_fast_forward()`
Martin Ågren
1
-15
/
+17
2018-05-02
merge: convert empty tree constant to the_hash_algo
brian m. carlson
1
-4
/
+1
2018-02-28
merge: always roll back lock in `checkout_fast_forward()`
Martin Ågren
1
-3
/
+9
2017-12-22
Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...
Junio C Hamano
1
-0
/
+33
2017-12-22
move index_has_changes() from builtin/am.c to merge.c for reuse
Elijah Newren
1
-0
/
+33
2017-10-07
read-cache: leave lock in right state in `write_locked_index()`
Martin Ågren
1
-3
/
+1
2017-10-06
treewide: prefer lockfiles on the stack
Martin Ågren
1
-4
/
+4
2017-05-08
tree: convert parse_tree_indirect to struct object_id
brian m. carlson
1
-2
/
+2
2017-05-08
merge: convert checkout_fast_forward to struct object_id
brian m. carlson
1
-4
/
+4
2016-12-07
lockfile: LOCK_REPORT_ON_ERROR
Junio C Hamano
1
-1
/
+1
2016-09-09
sequencer: lib'ify checkout_fast_forward()
Johannes Schindelin
1
-3
/
+6
2015-11-20
Convert struct object to object_id
brian m. carlson
1
-1
/
+1
2014-10-01
lockfile.h: extract new header file for the functions in lockfile.c
Michael Haggerty
1
-0
/
+1
2014-07-16
Merge branch 'nd/split-index'
Junio C Hamano
1
-4
/
+3
2014-06-19
merge: use argv_array when spawning merge strategy
Jeff King
1
-29
/
+13
2014-06-13
read-cache: new API write_locked_index instead of write_index/write_cache
Nguyễn Thái Ngọc Duy
1
-4
/
+3
2012-10-29
Move try_merge_command and checkout_fast_forward to libgit.a
Nguyễn Thái Ngọc Duy
1
-0
/
+112