This makes the "Write commit to file" context menu option generate a file that
is consumable by 'git am'.
Signed-off-by: Chris Packham <redacted>
---
Hi Paul,
This is the other side of a git patch I was looking at a while ago[1]. The basic
problem was people were using gitk's "Write commit to file" functionality to
generate patches for me to apply. It was hard to convince git am to consume these.
Eventually after some pointers from Junio I realised that if gitk just used
--pretty=email then it would generate files that were consumable by git am.
Just adding =email is the minimal change to make things work but it might be a
good idea to add --stat to make it more patch-like (or just switch to using
format-patch).
--
[1] - http://article.gmane.org/gmane.comp.version-control.git/256424
[2] - http://article.gmane.org/gmane.comp.version-control.git/256543
gitk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gitk b/gitk
index 78358a7..462f966 100755
--- a/gitk
+++ b/gitk
@@ -11936,7 +11936,7 @@ if { [info exists ::env(GIT_TRACE)] } {
}
# defaults...
-set wrcomcmd "git diff-tree --stdin -p --pretty"
+set wrcomcmd "git diff-tree --stdin -p --pretty=email"
set gitencoding {}
catch {--
2.0.4