diff options
| author | Wincent Colaiuta <win@wincent.com> | 2007-11-28 00:06:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-30 13:55:49 -0800 |
| commit | 804c7174c9d7c81b5215bcd9002f3bd600ecb6e4 (patch) | |
| tree | 138b93dbc0115d90ea5c20da4ff6a0b7c63c5bba /git-rebase--interactive.sh | |
| parent | d25430c5f88c7e7b4ce24c1b08e409f4345c4eb9 (diff) | |
| download | git-804c7174c9d7c81b5215bcd9002f3bd600ecb6e4.tar.gz | |
revert/cherry-pick: Allow overriding the help text by the calling Porcelain
A Porcelain command that uses cherry-pick or revert may make a commit
out of resolved index itself, in which case telling the user to commit
the result is not appropriate at all. This allows GIT_CHERRY_PICK_HELP
environment variable to be set by the calling Porcelain in order to
override the built-in help text.
[jc: this is heavily modified from the original but should be equivalent
in spirit]
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--interactive.sh')
| -rwxr-xr-x | git-rebase--interactive.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index e9cd6fd999..beeefec0e4 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -30,6 +30,11 @@ test -d "$REWRITTEN" && PRESERVE_MERGES=t test -f "$DOTEST"/strategy && STRATEGY="$(cat "$DOTEST"/strategy)" test -f "$DOTEST"/verbose && VERBOSE=t +GIT_CHERRY_PICK_HELP=" After resolving the conflicts, +mark the corrected paths with 'git add <paths>', and +run 'git rebase --continue'" +export GIT_CHERRY_PICK_HELP + warn () { echo "$*" >&2 } |