projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5a3a484 4e5dd04)
Merge branch 'jf/merge-ignore-ws'
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Oct 2010 04:40:54 +0000 (21:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Oct 2010 04:40:54 +0000 (21:40 -0700)
commit75b17fee72a0f78e0ad31728771231f8b3ed4d56
tree190461ec1fedaf1a3c5d5d7fc9201a5a6455a144tree | snapshot
parent5a3a484d577d8612f729d64f3a069e63df07ec07commit | diff
parent4e5dd044c62f2a82de083e7cd46cad7b0d3465aecommit | diff
Merge branch 'jf/merge-ignore-ws'

* jf/merge-ignore-ws:
  merge-recursive: options to ignore whitespace changes
  merge-recursive --patience
  ll-merge: replace flag argument with options struct
  merge-recursive: expose merge options for builtin merge
Documentation/merge-strategies.txt diff1 | diff2 | blob | history
builtin/checkout.c diff1 | diff2 | blob | history
builtin/merge-recursive.c diff1 | diff2 | blob | history
builtin/merge.c diff1 | diff2 | blob | history
merge-recursive.c diff1 | diff2 | blob | history
merge-recursive.h diff1 | diff2 | blob | history
rerere.c diff1 | diff2 | blob | history
Git—the stupid content tracker