projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 283c63f 0895c6d)
Merge branch 'jk/diff-algo-finishing-touches' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Apr 2013 23:17:13 +0000 (16:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Apr 2013 23:19:42 +0000 (16:19 -0700)
commite4d15959d45468bfb13c80195e3a6b40f5b0a489
tree847ff7ecdecbd5b4babe51cc57354a6b2d4f6091tree | snapshot
parent283c63fac2c76deda2058f03000e18fb35d44fb6commit | diff
parent0895c6d4c09045a3faeb7b652a844fc81c774631commit | diff
Merge branch 'jk/diff-algo-finishing-touches' into maint

"git diff --diff-algorithm=algo" was understood by the command line
parser, but "git diff --diff-algorithm algo" was not.

* jk/diff-algo-finishing-touches:
  diff: allow unstuck arguments with --diff-algorithm
  git-merge(1): document diff-algorithm option to merge-recursive
diff.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.