Merge branch 'ma/skip-writing-unchanged-index' into next
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Mar 2018 22:10:56 +0000 (15:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Mar 2018 22:10:56 +0000 (15:10 -0700)
Internal API clean-up to allow write_locked_index() optionally skip
writing the in-core index when it is not modified.

* ma/skip-writing-unchanged-index:
write_locked_index(): add flag to avoid writing unchanged index

1  2 
builtin/add.c
builtin/commit.c
builtin/merge.c
builtin/mv.c
builtin/rm.c
cache.h
merge-recursive.c
read-cache.c
sequencer.c
diff --cc builtin/add.c
Simple merge
Simple merge
diff --cc builtin/merge.c
Simple merge
diff --cc builtin/mv.c
Simple merge
diff --cc builtin/rm.c
Simple merge
diff --cc cache.h
Simple merge
Simple merge
diff --cc read-cache.c
Simple merge
diff --cc sequencer.c
Simple merge