| commit | 5cba1229d8246da2a6d1d956eeed8227f69e185b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 22 Aug 2010 06:29:11 +0000 (21 23:29 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 22 Aug 2010 06:29:11 +0000 (21 23:29 -0700) | ||
| tree | 4ebb3bbc82225d157ca2f82474eb93fefe35c20d | treesnapshot (tar.gz zip) |
| parent | b95d0a2f8cb2923fed417e649a66c7372b968248 | commitdiff |
| parent | d1c3b10f7ced34a607c50de8b5c271ce9cf764ea | commitdiff |
Merge branch 'mm/rebase-i-exec'
* mm/rebase-i-exec:
git-rebase--interactive.sh: use printf instead of echo to print commit message
git-rebase--interactive.sh: rework skip_unnecessary_picks
test-lib: user-friendly alternatives to test [-d|-f|-e]
rebase -i: add exec command to launch a shell command
Conflicts:
git-rebase--interactive.sh
t/t3404-rebase-interactive.sh
* mm/rebase-i-exec:
git-rebase--interactive.sh: use printf instead of echo to print commit message
git-rebase--interactive.sh: rework skip_unnecessary_picks
test-lib: user-friendly alternatives to test [-d|-f|-e]
rebase -i: add exec command to launch a shell command
Conflicts:
git-rebase--interactive.sh
t/t3404-rebase-interactive.sh
| Documentation/git-rebase.txt | diff1 | diff2 | blobhistory |
| git-rebase--interactive.sh | diff1 | diff2 | blobhistory |
| t/t3404-rebase-interactive.sh | diff1 | diff2 | blobhistory |
| t/test-lib.sh | diff1 | diff2 | blobhistory |