summaryrefslogtreecommitdiff
path: root/notes-merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-28 10:34:40 -0700
committerJunio C Hamano <gitster@pobox.com>2016-07-28 10:34:40 -0700
commitc97268c822077ba414f90f6ba357fab170bb3986 (patch)
tree344e1158e92b2eb88adcb12589ba174966fd1e43 /notes-merge.c
parent8c6d1f9807c67532e7fb545a944b064faff0f70b (diff)
parentcbcd2cbd5942cc890c1a1125593e1108c3e6a077 (diff)
downloadgit-c97268c822077ba414f90f6ba357fab170bb3986.tar.gz
Merge branch 'js/rebase-i-tests'
A few tests that specifically target "git rebase -i" have been added. * js/rebase-i-tests: rebase -i: we allow extra spaces after fixup!/squash! rebase -i: demonstrate a bug with --autosquash t3404: add a test for the --gpg-sign option
Diffstat (limited to 'notes-merge.c')
0 files changed, 0 insertions, 0 deletions