git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bf72ac1)
t3418: non-interactive rebase --continue with rerere enabled
authorPaul Tan <redacted>
Sun, 19 Jul 2015 15:49:17 +0000 (23:49 +0800)
committerJunio C Hamano <redacted>
Mon, 20 Jul 2015 17:53:01 +0000 (10:53 -0700)
commit0f62fbae652982d9bb286abed689e9223b0f998e
tree1cd749703ab95a3ccb102e42897e12fcf0259cc8tree | snapshot
parentbf72ac17d7c9441fd30f9a9764b399c74142204bcommit | diff
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 <redacted>
Reviewed-by: Johannes Schindelin <redacted>
Signed-off-by: Paul Tan <redacted>
Signed-off-by: Junio C Hamano <redacted>
t/t3418-rebase-continue.sh diff | blob | history
git clone https://git.99rst.org/PROJECT