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
..
add.c
annotate.c
apply.c
archive.c
bisect--helper.c
blame.c
branch.c
bundle.c	Use angles for placeholders consistently	2010-10-08 12:29:52 -07:00
cat-file.c
check-attr.c
check-ref-format.c
checkout-index.c	Fix {update,checkout}-index usage strings	2010-10-08 12:31:08 -07:00
checkout.c	Merge branch 'jf/merge-ignore-ws'	2010-10-26 21:40:54 -07:00
clean.c
clone.c
commit-tree.c	Sync with 1.7.3.2	2010-10-21 17:16:10 -07:00
commit.c
config.c
count-objects.c
describe.c
diff-files.c
diff-index.c
diff-tree.c
diff.c
fast-export.c
fetch-pack.c
fetch.c	Use parentheses and `...' where appropriate	2010-10-08 12:31:07 -07:00
fmt-merge-msg.c
for-each-ref.c
fsck.c
gc.c
grep.c	Use angles for placeholders consistently	2010-10-08 12:29:52 -07:00
hash-object.c
help.c
index-pack.c	Use parentheses and `...' where appropriate	2010-10-08 12:31:07 -07:00
init-db.c	init: plug tiny one-time memory leak	2010-10-06 10:46:05 -07:00
log.c	Merge branch 'rr/format-patch-count-without-merges'	2010-09-29 13:49:09 -07:00
ls-files.c	Use parentheses and `...' where appropriate	2010-10-08 12:31:07 -07:00
ls-remote.c
ls-tree.c	Use angles for placeholders consistently	2010-10-08 12:29:52 -07:00
mailinfo.c
mailsplit.c	Use parentheses and `...' where appropriate	2010-10-08 12:31:07 -07:00
merge-base.c
merge-file.c
merge-index.c
merge-ours.c
merge-recursive.c	Merge branch 'jf/merge-ignore-ws'	2010-10-26 21:40:54 -07:00
merge-tree.c
merge.c	Merge branch 'jf/merge-ignore-ws'	2010-10-26 21:40:54 -07:00
mktag.c
mktree.c
mv.c
name-rev.c
notes.c
pack-objects.c	Put a space between `<' and argument in pack-objects usage string	2010-10-08 12:31:08 -07:00
pack-redundant.c
pack-refs.c
patch-id.c
prune-packed.c
prune.c
push.c
read-tree.c
receive-pack.c
reflog.c
remote.c	Use parentheses and `...' where appropriate	2010-10-08 12:31:07 -07:00
replace.c
rerere.c
reset.c
rev-list.c	Use angles for placeholders consistently	2010-10-08 12:29:52 -07:00
rev-parse.c
revert.c
rm.c
send-pack.c
shortlog.c
show-branch.c	Use parentheses and `...' where appropriate	2010-10-08 12:31:07 -07:00
show-ref.c
stripspace.c
symbolic-ref.c
tag.c
tar-tree.c
unpack-file.c
unpack-objects.c	do not depend on signed integer overflow	2010-10-06 11:10:07 -07:00
update-index.c	Fix {update,checkout}-index usage strings	2010-10-08 12:31:08 -07:00
update-ref.c
update-server-info.c
upload-archive.c
var.c
verify-pack.c
verify-tag.c
write-tree.c