| commit | 0f62fbae652982d9bb286abed689e9223b0f998e | |
| author | Paul Tan <pyokagan@gmail.com> | |
| Sun, 19 Jul 2015 15:49:17 +0000 (19 23:49 +0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 20 Jul 2015 17:53:01 +0000 (20 10:53 -0700) | ||
| tree | 1cd749703ab95a3ccb102e42897e12fcf0259cc8 | treesnapshot (tar.gz zip) |
| parent | bf72ac17d7c9441fd30f9a9764b399c74142204b | commitdiff |
t3418: non-interactive rebase --continue with rerere enabled
Since 8389b52 (git-rerere: reuse recorded resolve., 2006-01-28), git-am
will call git-rerere to re-use recorded merge conflict resolutions if
any occur in a threeway merge.
Add a test to ensure that git-rerere is called by git-am (which handles
the non-interactive rebase).
Reviewed-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Since 8389b52 (git-rerere: reuse recorded resolve., 2006-01-28), git-am
will call git-rerere to re-use recorded merge conflict resolutions if
any occur in a threeway merge.
Add a test to ensure that git-rerere is called by git-am (which handles
the non-interactive rebase).
Reviewed-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t3418-rebase-continue.sh | diffblobblamehistory |