diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-08-21 23:29:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-21 23:29:11 -0700 |
| commit | 5cba1229d8246da2a6d1d956eeed8227f69e185b (patch) | |
| tree | 4ebb3bbc82225d157ca2f82474eb93fefe35c20d /git-mergetool--lib.sh | |
| parent | Merge branch 'gb/split-cmdline-errmsg' (diff) | |
| parent | git-rebase--interactive.sh: use printf instead of echo to print commit message (diff) | |
| download | tgif-5cba1229d8246da2a6d1d956eeed8227f69e185b.tar.xz | |
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
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions