projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 22c67ca) | patch
Fix off-by-one error in git-merge
authorJunio C Hamano <junkio@cox.net>
Tue, 13 Sep 2005 05:20:42 +0000 (22:20 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 13 Sep 2005 05:52:52 +0000 (22:52 -0700)
commitf88ed172e7a391bd907798ad2a3347a83cd24317
tree6b044bd249b4b07e695dfb06eca3fea9d25b8458tree | snapshot
parent22c67ca88ec65c4f278e8c82b2d98f3bd025238bcommit | diff
Fix off-by-one error in git-merge

'git-merge -s' without a strategy name does not fail and does
not give usage as it should.

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-merge.sh diff | blob | history
The core git plumbing