projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f3d6073 cc54570)
Merge branch 'js/patience-diff'
authorJunio C Hamano <gitster@pobox.com>
Sat, 24 Jan 2009 05:51:38 +0000 (21:51 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 24 Jan 2009 05:51:38 +0000 (21:51 -0800)
commit5dc1308562ab5991ecada68b06707709bea408c9
tree321b8d7310c01d8b01584377d9aba448952a7384tree | snapshot
parentf3d6073e02f8ee8dc6376b0262151dbbfbbdfe7dcommit | diff
parentcc545709253fe8440db2648cb5c771e5b126bdb5commit | diff
Merge branch 'js/patience-diff'

* js/patience-diff:
  bash completions: Add the --patience option
  Introduce the diff option '--patience'
  Implement the patience diff algorithm

Conflicts:
contrib/completion/git-completion.bash
Documentation/diff-options.txt diff1 | diff2 | blob | history
Makefile diff1 | diff2 | blob | history
contrib/completion/git-completion.bash diff1 | diff2 | blob | history
diff.c diff1 | diff2 | blob | history
xdiff/xdiff.h diff1 | diff2 | blob | history
Git—the stupid content tracker