Re: [PATCH] Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"
From: Stephan Beyer <hidden>
Date: 2016-06-15 22:44:59
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH] Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge" · Olivier Marin <hidden>
- 2016-06-15 · Re: [PATCH] Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge" · Olivier Marin <hidden>
- 2016-06-15 · Re: [PATCH] Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge" · Stephan Beyer <hidden>
- 2016-06-15 · Re: [PATCH] Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge" · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge" · Junio C Hamano <hidden>
Hi, Junio C Hamano wrote:
Olivier Marin [off-list ref] writes:quoted
@@ -203,9 +204,10 @@ then case "$abort" in t) - rm -fr "$dotest" && + git rerere clear && git read-tree -m -u ORIG_HEAD &&
[...]
quoted hunk ↗ jump to hunk
diff --git a/git-am.sh b/git-am.sh index a44bd7a..5cbf8f4 100755 --- a/git-am.sh +++ b/git-am.sh@@ -203,9 +203,9 @@ then case "$abort" in t) - rm -fr "$dotest" && - git read-tree -m -u ORIG_HEAD && - git reset ORIG_HEAD && : + git rerere clear + git read-tree --reset -u HEAD ORIG_HEAD
Perhaps I am confused, but ... Why is there "HEAD" and "ORIG_HEAD" and not only "ORIG_HEAD"? Regards. -- Stephan Beyer [off-list ref], PGP 0x6EDDD207FCC5040F