diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-02 23:00:28 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-02 23:00:28 -0800 |
| commit | 5b0d61637c21d80bcc781aa135ed1959326713bb (patch) | |
| tree | e8f7c7dd036b9f3a4bc4aa6c3e02462f2fa4c10a /git-rebase--interactive.sh | |
| parent | a1d3b0cae1f98b6347a3ee706973914acf16c072 (diff) | |
| parent | 0d8135891eb81d06d818a53c479ea3798df96e3a (diff) | |
| download | git-5b0d61637c21d80bcc781aa135ed1959326713bb.tar.gz | |
Merge branch 'wc/rebase-insn'
* wc/rebase-insn:
Mention that git-rm can be an appropriate resolution as well as git-add.
revert/cherry-pick: Allow overriding the help text by the calling Porcelain
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 } |