Junio C Hamano 75b17fee72 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

2010-10-26 21:40:54 -07:00

..

.gitignore

…

api-allocation-growing.txt

…

api-builtin.txt

…

api-decorate.txt

…

api-diff.txt

…

api-directory-listing.txt

…

api-gitattributes.txt

…

api-grep.txt

…

api-hash.txt

…

api-history-graph.txt

…

api-in-core-index.txt

…

api-index-skel.txt

…

api-index.sh

…

api-lockfile.txt

…

api-merge.txt

ll-merge: replace flag argument with options struct

2010-08-26 09:18:51 -07:00

api-object-access.txt

…

api-parse-options.txt

Documentation/technical: avoid stray backslash in parse-options API docs

2010-08-20 14:16:22 -07:00

api-quote.txt

…

api-remote.txt

…

api-revision-walking.txt

…

api-run-command.txt

…

api-setup.txt

…

api-strbuf.txt

…

api-string-list.txt

string_list: Fix argument order for string_list_append

2010-06-27 10:06:52 -07:00

api-tree-walking.txt

unpack_trees: group error messages by type

2010-08-11 10:36:06 -07:00

api-xdiff-interface.txt

…

pack-format.txt

…

pack-heuristics.txt

…

pack-protocol.txt

…

protocol-capabilities.txt

Documentation: Spelling fix in protocol-capabilities.txt

2010-07-09 17:36:28 -07:00

protocol-common.txt

…

racy-git.txt

…

send-pack-pipeline.txt

…

shallow.txt

…

trivial-merge.txt

…