chiark / gitweb /
~ianmdlvl / dgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8273a14) | patch
git-debrebase: gdr-merge-conflicts: Call git merge --no-edit
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 25 Aug 2018 17:32:56 +0000 (18:32 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 26 Aug 2018 00:20:43 +0000 (01:20 +0100)
commit30a7ead54a9ca133f1f0d7ac7c3836d9e6fb86a1
tree80ed2094c35b82e1e1319900473c2bdfd7a16966tree | snapshot
parent8273a14340edc80b2a71815c8a0e6149f9b8392acommit | diff
git-debrebase: gdr-merge-conflicts: Call git merge --no-edit

The default seems different in my sid chroot.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
tests/tests/gdr-merge-conflicts diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.