]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f02fbc4 0e94242)
Merge branch 'jc/maint-index-pack-keep' into jc/index-pack
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Mar 2016 21:16:45 +0000 (13:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Mar 2016 21:16:45 +0000 (13:16 -0800)
* jc/maint-index-pack-keep:
  index-pack: correct --keep[=<msg>]

1  2 
builtin/index-pack.c patch | diff1 | diff2 | blob | history
t/t5300-pack-object.sh patch | diff1 | diff2 | blob | history

diff --cc builtin/index-pack.c
Simple merge
diff --cc t/t5300-pack-object.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.