aboutsummaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-08-29 14:50:01 -0700
committerJunio C Hamano <gitster@pobox.com>2012-08-29 14:50:01 -0700
commit4514de70c2e006f6b817498bf941d2b789feaaa7 (patch)
tree75c949475c4473fb0e6e0528e8aadf4f2a84931c /combine-diff.c
parent570f2933ff51ca41c17393657fd52c6d276b22fa (diff)
parent1af221ef5cb84c792303a0d16ca91197e2b70279 (diff)
downloadgit-4514de70c2e006f6b817498bf941d2b789feaaa7.tar.gz
git-4514de70c2e006f6b817498bf941d2b789feaaa7.tar.xz
Merge branch 'mg/rebase-i-onto-reflog-in-full'
The reflog entries left by "git rebase" and "git rebase -i" were inconsistent. * mg/rebase-i-onto-reflog-in-full: rebase -i: use full onto sha1 in reflog
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions