aboutsummaryrefslogtreecommitdiffstats
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-09-16 00:50:57 -0700
committerJunio C Hamano <gitster@pobox.com>2008-09-16 00:50:57 -0700
commit132c6e443cb76d0baf9eece7b9424d25dc83a91d (patch)
tree7eb4c96690840054ef2ae02d0065df114bc12808 /combine-diff.c
parentMerge branch 'jc/maint-checkout-keep-remove' (diff)
parentgit-rebase--interactive: auto amend only edited commit (diff)
downloadgit-132c6e443cb76d0baf9eece7b9424d25dc83a91d.tar.gz
git-132c6e443cb76d0baf9eece7b9424d25dc83a91d.zip
Merge branch 'dp/maint-rebase-fix'
* dp/maint-rebase-fix: git-rebase--interactive: auto amend only edited commit git-rebase-interactive: do not squash commits on abort
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions