| commit | 3ba513c32e7b9102187d94d1c43f33d9559fb334 | |
| author | Linus Torvalds <torvalds@g5.osdl.org> | |
| Sat, 9 Jul 2005 00:38:44 +0000 (8 17:38 -0700) | ||
| committer | Linus Torvalds <torvalds@g5.osdl.org> | |
| Sat, 9 Jul 2005 00:38:44 +0000 (8 17:38 -0700) | ||
| tree | 8121f48b07e68ea9fb3e5c1c7b6d4b68b915bca5 | treesnapshot (tar.gz zip) |
| parent | 69a97f1d9bb9455b634564e91f33479ffc35c02b | commitdiff |
Make "git resolve" take the merge message in $3
It used to do "Merge $3" as the message, but that ends up being
inconvenient, and much more easily done inside git-pull-script instead.
This makes the third argument to "git resolve" much easier to explain.
It used to do "Merge $3" as the message, but that ends up being
inconvenient, and much more easily done inside git-pull-script instead.
This makes the third argument to "git resolve" much easier to explain.
| git-pull-script | diffblobblamehistory | |
| git-resolve-script | diffblobblamehistory |