Junio C Hamano 9bec60d3a5 Merge branch 'pn/commit-autosquash' ... * pn/commit-autosquash: add tests of commit --squash commit: --squash option for use with rebase --autosquash add tests of commit --fixup commit: --fixup option for use with rebase --autosquash pretty.c: teach format_commit_message() to reencode the output commit: helper methods to reduce redundant blocks of code Conflicts: Documentation/git-commit.txt t/t3415-rebase-autosquash.sh		2010-12-03 16:13:06 -08:00
..
add.c	Merge branch 'maint'	2010-12-01 16:41:13 -08:00
annotate.c
apply.c	Merge branch 'fc/apply-p2-get-header-name'	2010-11-29 17:52:33 -08:00
archive.c
bisect--helper.c
blame.c	Merge branch 'kb/blame-author-email'	2010-11-29 17:52:32 -08:00
branch.c	branch: improve --verbose description	2010-11-15 10:05:44 -08:00
bundle.c	Use angles for placeholders consistently	2010-10-08 12:29:52 -07:00
cat-file.c	blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''	2010-09-29 16:53:25 -07:00
check-attr.c
check-ref-format.c
checkout-index.c	Describe various forms of "be quiet" using OPT__QUIET	2010-11-15 10:04:56 -08:00
checkout.c	Merge branch 'rs/opt-help-text'	2010-11-24 15:55:19 -08:00
clean.c	Merge branch 'rs/opt-help-text'	2010-11-24 15:55:19 -08:00
clone.c	clone: Add the --recurse-submodules option as alias for --recursive	2010-11-05 10:28:01 -07:00
commit-tree.c	Sync with 1.7.3.2	2010-10-21 17:16:10 -07:00
commit.c	Merge branch 'pn/commit-autosquash'	2010-12-03 16:13:06 -08:00
config.c	Merge branch 'jn/paginate-fix'	2010-08-31 16:23:31 -07:00
count-objects.c	add description parameter to OPT__VERBOSE	2010-11-15 09:56:51 -08:00
describe.c
diff-files.c
diff-index.c
diff-tree.c
diff.c	diff,difftool: Don't use the {0,2} notation in usage strings	2010-11-05 10:05:31 -07:00
fast-export.c	Merge branch 'en/d-f-conflict-fix'	2010-09-08 08:54:01 -07:00
fetch-pack.c
fetch.c	Merge branch 'rs/opt-help-text'	2010-11-24 15:55:19 -08:00
fmt-merge-msg.c	Change incorrect "remote branch" to "remote tracking branch" in C code	2010-11-03 09:20:47 -07:00
for-each-ref.c	for-each-ref: fix objectname:short bug	2010-08-26 16:42:25 -07:00
fsck.c	add description parameter to OPT__VERBOSE	2010-11-15 09:56:51 -08:00
gc.c	Describe various forms of "be quiet" using OPT__QUIET	2010-11-15 10:04:56 -08:00
grep.c	add description parameter to OPT__QUIET	2010-11-15 09:58:13 -08: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 'pn/commit-autosquash'	2010-12-03 16:13:06 -08: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	commit: helper methods to reduce redundant blocks of code	2010-11-04 13:53:34 -07:00
mailsplit.c	Use parentheses and `...' where appropriate	2010-10-08 12:31:07 -07:00
merge-base.c
merge-file.c	Merge branch 'rs/opt-help-text'	2010-11-24 15:55:19 -08:00
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 'cb/maint-orphan-merge-noclobber'	2010-11-24 15:55:36 -08:00
mktag.c
mktree.c
mv.c	add OPT__FORCE	2010-11-15 10:04:43 -08:00
name-rev.c	object.h: Add OBJECT_ARRAY_INIT macro and make use of it.	2010-08-29 22:42:49 -07:00
notes.c	add OPT__FORCE	2010-11-15 10:04:43 -08:00
pack-objects.c	make pack-objects a bit more resilient to repo corruption	2010-10-22 14:59:58 -07:00
pack-redundant.c
pack-refs.c
patch-id.c
prune-packed.c
prune.c	add description parameter to OPT__DRY_RUN	2010-11-15 09:57:37 -08:00
push.c
read-tree.c	add description parameter to OPT__VERBOSE	2010-11-15 09:56:51 -08:00
receive-pack.c
reflog.c
remote.c	Merge branch 'rs/opt-help-text'	2010-11-24 15:55:19 -08:00
replace.c
rerere.c	Merge branch 'jn/merge-renormalize'	2010-09-03 09:43:41 -07:00
reset.c	Describe various forms of "be quiet" using OPT__QUIET	2010-11-15 10:04:56 -08:00
rev-list.c	Merge branch 'jk/maint-rev-list-nul' into maint	2010-11-24 12:46:32 -08:00
rev-parse.c
revert.c	Merge branch 'jn/cherry-pick-refresh-index'	2010-11-29 17:52:34 -08:00
rm.c	Describe various forms of "be quiet" using OPT__QUIET	2010-11-15 10:04:56 -08:00
send-pack.c	Merge branch 'jk/push-progress'	2010-11-17 15:01:00 -08:00
shortlog.c
show-branch.c	Use parentheses and `...' where appropriate	2010-10-08 12:31:07 -07:00
show-ref.c	Describe various forms of "be quiet" using OPT__QUIET	2010-11-15 10:04:56 -08:00
stripspace.c
symbolic-ref.c	Describe various forms of "be quiet" using OPT__QUIET	2010-11-15 10:04:56 -08:00
tag.c	add OPT__FORCE	2010-11-15 10:04:43 -08:00
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	add OPT__FORCE	2010-11-15 10:04:43 -08:00
upload-archive.c
var.c
verify-pack.c
verify-tag.c	verify-tag: document --verbose	2010-11-15 10:05:54 -08:00
write-tree.c