diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-04-03 12:28:38 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-04-03 12:28:38 -0700 |
commit | df9930c129d4cfe4d39e5e4688a6a55a2bca0050 (patch) | |
tree | 88fc77f49407ca34c62f0ca53b4f0e6b84e81ecb /userdiff.h | |
parent | Merge branch 'ak/everyday-git' (diff) | |
parent | rebase--interactive: don't require what's rebased to be a branch (diff) | |
download | tgif-df9930c129d4cfe4d39e5e4688a6a55a2bca0050.tar.xz |
Merge branch 'do/rebase-i-arbitrary'
* do/rebase-i-arbitrary:
rebase--interactive: don't require what's rebased to be a branch
Conflicts:
t/t3404-rebase-interactive.sh
Diffstat (limited to 'userdiff.h')
0 files changed, 0 insertions, 0 deletions