Andrew's git / gitweb.git / diff
?
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)
* 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

1  2 
Documentation/merge-strategies.txt patch | diff1 | diff2 | blob | history
builtin/checkout.c patch | diff1 | diff2 | blob | history
builtin/merge-recursive.c patch | diff1 | diff2 | blob | history
builtin/merge.c patch | diff1 | diff2 | blob | history
merge-recursive.c patch | diff1 | diff2 | blob | history
merge-recursive.h patch | diff1 | diff2 | blob | history
rerere.c patch | diff1 | diff2 | blob | history
diff --cc Documentation/merge-strategies.txt
Simple merge
diff --cc builtin/checkout.c
Simple merge
diff --cc builtin/merge-recursive.c
index 78b9db76a0819529e7f6cab44319acd2978c9e9b,70e1d258fb49ad917674f62cd1864d3a1517752a..c33091b3ed52bc8539ff82f039ec8c7718f3dcc2
--- 1/builtin/merge-recursive.c
--- 2/builtin/merge-recursive.c
+++ b/builtin/merge-recursive.c
@@@ -2,10 -2,8 +2,11 @@@
  #include "commit.h"
  #include "tag.h"
  #include "merge-recursive.h"
+ #include "xdiff-interface.h"
  
 +static const char builtin_merge_recursive_usage[] =
 +      "git %s <base>... -- <head> <remote> ...";
 +
  static const char *better_branch_name(const char *branch)
  {
        static char githead_env[8 + 40 + 1];
diff --cc builtin/merge.c
Simple merge
diff --cc merge-recursive.c
Simple merge
diff --cc merge-recursive.h
Simple merge
diff --cc rerere.c
Simple merge