]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 948cf4f 0895c6d)
Merge branch 'jk/diff-algo-finishing-touches'
authorJunio C Hamano <gitster@pobox.com>
Mon, 15 Apr 2013 19:40:58 +0000 (12:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 15 Apr 2013 19:40:58 +0000 (12:40 -0700)
"git diff --diff-algorithm algo" is also understood as "git diff
--diff-algorithm=algo".

* jk/diff-algo-finishing-touches:
  diff: allow unstuck arguments with --diff-algorithm
  git-merge(1): document diff-algorithm option to merge-recursive

1  2 
diff.c patch | diff1 | diff2 | blob | history

diff --cc diff.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.