aboutsummaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-27 01:08:02 -0800
committerJunio C Hamano <gitster@pobox.com>2009-01-27 01:08:02 -0800
commit90b23e5f21e101f14da60375e4bda265a677e209 (patch)
treeeffeccd13890741e6f0d5bafabd65be2c0d92551 /git-rebase--interactive.sh
parent5c415311f743ccb11a50f350ff1c385778f049d6 (diff)
parentb67b9612e1a90ae093445abeaeff930e9f4cf936 (diff)
downloadgit-90b23e5f21e101f14da60375e4bda265a677e209.tar.gz
git-90b23e5f21e101f14da60375e4bda265a677e209.tar.xz
Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-split-diff-metainfo
This is an evil merge, as a test added since 1.6.0 expects an incorrect behaviour the merged commit fixes. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--interactive.sh')
0 files changed, 0 insertions, 0 deletions