diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-08 17:38:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-08 17:38:44 -0700 |
| commit | 3ba513c32e7b9102187d94d1c43f33d9559fb334 (patch) | |
| tree | 8121f48b07e68ea9fb3e5c1c7b6d4b68b915bca5 /git-format-patch-script | |
| parent | [PATCH] Use SHA1 for git-update-cache --refresh (diff) | |
| download | git-3ba513c32e7b9102187d94d1c43f33d9559fb334.tar.gz git-3ba513c32e7b9102187d94d1c43f33d9559fb334.zip | |
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.
Diffstat (limited to 'git-format-patch-script')
0 files changed, 0 insertions, 0 deletions