Neil Horman b27cfb0d8d git-cherry-pick: Add keep-redundant-commits option ... The git-cherry-pick --allow-empty command by default only preserves empty commits that were originally empty, i.e only those commits for which <commit>^{tree} and <commit>^^{tree} are equal. By default commits which are non-empty, but were made empty by the inclusion of a prior commit on the current history are filtered out. This option allows us to override that behavior and include redundant commits as empty commits in the change history. Note that this patch changes the default behavior of git cherry-pick slightly. Prior to this patch all commits in a cherry-pick sequence were applied and git commit was run. The implication here was that, if a commit was redundant, and the commit did not trigger the fast forward logic, the git commit operation, and therefore the git cherry-pick operation would fail, displaying the cherry pick advice (i.e. run git commit --allow-empty). With this patch however, such redundant commits are automatically skipped without stopping, unless --keep-redundant-commits is specified, in which case, they are automatically applied as empty commits. Signed-off-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2012-04-24 14:52:12 -07:00
..
add.c	Merge branch 'js/add-e-submodule-fix' into maint	2012-02-13 11:42:18 -08:00
annotate.c
apply.c	Use correct grammar in diffstat summary line	2012-02-03 23:19:42 -08:00
archive.c	Revert "upload-archive: use start_command instead of fork"	2011-11-15 15:39:33 -08:00
bisect--helper.c	bisect: introduce support for --no-checkout option.	2011-08-04 15:34:32 -07:00
blame.c	Merge branch 'zj/decimal-width'	2012-02-20 00:15:11 -08:00
branch.c	Merge branch 'cn/maint-branch-with-bad' into maint	2012-03-04 22:17:52 -08:00
bundle.c	Teach progress eye-candy to fetch_refs_from_bundle()	2011-09-19 11:07:21 -07:00
cat-file.c	drop odd return value semantics from userdiff_config	2012-02-07 10:44:54 -08:00
check-attr.c	Merge branch 'bc/attr-ignore-case'	2011-10-17 21:37:14 -07:00
check-ref-format.c	Change check_refname_format() to reject unnormalized refnames	2011-10-05 13:45:30 -07:00
checkout-index.c	checkout-index: remove obsolete comment	2011-08-17 10:39:47 -07:00
checkout.c	Merge branch 'jc/checkout-out-of-unborn' into maint	2012-02-16 14:18:06 -08:00
clean.c	Documentation: clarify "git clean -e <pattern>"	2011-08-28 23:47:55 -07:00
clone.c	Merge branch 'cb/transfer-no-progress' into maint	2012-02-21 15:14:37 -08:00
commit-tree.c	Merge branch 'jc/show-sig'	2012-01-06 12:44:07 -08:00
commit.c	Merge branch 'jx/i18n-more-marking' into maint	2012-02-16 13:59:53 -08:00
config.c	config: remove useless assignment	2012-03-28 15:19:17 -07:00
count-objects.c
describe.c	describe: Refresh the index when run with --dirty	2011-09-23 14:28:17 -07:00
diff-files.c
diff-index.c
diff-tree.c	diffcore-rename: fall back to -C when -C -C busts the rename limit	2011-03-22 14:29:07 -07:00
diff.c	diff --stat: add config option to limit graph width	2012-03-01 09:15:58 -08:00
fast-export.c	Merge branch 'rs/no-no-no-parseopt'	2012-03-01 20:59:31 -08:00
fetch-pack.c	Merge branch 'cb/transfer-no-progress'	2012-02-20 00:14:55 -08:00
fetch.c	Merge branch 'cb/transfer-no-progress'	2012-02-20 00:14:55 -08:00
fmt-merge-msg.c	Convert resolve_ref+xstrdup to new resolve_refdup function	2011-12-13 09:26:52 -08:00
for-each-ref.c	Convert resolve_ref+xstrdup to new resolve_refdup function	2011-12-13 09:26:52 -08:00
fsck.c	fsck: --no-dangling omits "dangling object" information	2012-02-28 14:55:39 -08:00
gc.c	prune: handle --progress/no-progress	2011-11-07 22:12:19 -08:00
grep.c	Merge branch 'rs/no-no-no-parseopt'	2012-03-01 20:59:31 -08:00
hash-object.c	index_fd(): turn write_object and format_check arguments into one flag	2011-05-09 11:58:19 -07:00
help.c
index-pack.c	index-pack: eliminate unlimited recursion in get_base_data()	2012-01-16 14:34:33 -08:00
init-db.c	builtin/init-db.c: eliminate -Wformat warning on Solaris	2011-12-20 16:02:08 -08:00
log.c	diff --stat: add config option to limit graph width	2012-03-01 09:15:58 -08:00
ls-files.c	Merge branch 'cb/common-prefix-unification'	2011-10-10 15:56:17 -07:00
ls-remote.c	Merge branch 'jc/ls-remote-short-help'	2011-10-05 12:36:26 -07:00
ls-tree.c	Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails.	2011-07-25 10:50:11 -07:00
mailinfo.c	mailinfo: with -b, keep space after [foo]	2012-01-16 16:06:57 -08:00
mailsplit.c
merge-base.c	Documentation: update to git-merge-base --octopus	2011-04-15 10:13:52 -07:00
merge-file.c
merge-index.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
merge-ours.c
merge-recursive.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
merge-tree.c	sparse: Fix an "symbol 'merge_file' not decared" warning	2011-04-11 10:35:25 -07:00
merge.c	Sync with 1.7.9.6	2012-04-02 13:11:49 -07:00
mktag.c	read_sha1_file(): get rid of read_sha1_file_repl() madness	2011-05-15 15:23:33 -07:00
mktree.c	Merge "Move 'builtin-*' into a 'builtin/' subdirectory"	2011-11-10 09:10:51 -08:00
mv.c	Merge branch 'jk/maint-mv' into maint	2011-12-28 11:32:36 -08:00
name-rev.c	Merge branch 'jc/maint-name-rev-all' into maint-1.7.6	2011-12-13 21:12:34 -08:00
notes.c	Merge branch 'nd/war-on-nul-in-commit'	2011-12-22 11:27:26 -08:00
pack-objects.c	pack-objects: Fix compilation with NO_PTHREDS	2012-02-26 17:46:00 -08:00
pack-redundant.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
pack-refs.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
patch-id.c	patch-id.c: use strbuf instead of a fixed buffer	2011-09-22 09:35:07 -07:00
prune-packed.c	fix deletion of .git/objects sub-directories in git-prune/repack	2012-03-07 10:24:33 -08:00
prune.c	fix deletion of .git/objects sub-directories in git-prune/repack	2012-03-07 10:24:33 -08:00
push.c	Merge branch 'fc/push-prune'	2012-02-26 23:05:45 -08:00
read-tree.c	Teach read-tree the -n|--dry-run option	2011-05-25 15:04:25 -07:00
receive-pack.c	Merge branch 'cb/receive-pack-keep-errors' into maint	2012-02-21 15:14:41 -08:00
reflog.c	prune: show progress while marking reachable objects	2011-11-07 22:12:19 -08:00
remote-ext.c	Remove unused variables	2011-03-22 11:43:27 -07:00
remote-fd.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
remote.c	Merge branch 'pj/remote-set-branches-usage-fix' into maint	2012-02-27 15:33:33 -08:00
replace.c	Convert many resolve_ref() calls to read_ref*() and ref_exists()	2011-11-13 12:21:06 -08:00
rerere.c	rerere: libify rerere_clear() and rerere_gc()	2011-05-08 12:55:34 -07:00
reset.c	reset: update cache-tree data when appropriate	2011-12-06 15:13:39 -08:00
rev-list.c	rev-list: fix --verify-objects --quiet becoming --objects	2012-02-28 10:47:30 -08:00
rev-parse.c	rev-parse: add option --resolve-git-dir <path>	2011-08-16 11:04:31 -07:00
revert.c	git-cherry-pick: Add keep-redundant-commits option	2012-04-24 14:52:12 -07:00
rm.c	i18n: git-rm basic messages	2011-03-09 23:52:56 -08:00
send-pack.c	push/fetch/clone --no-progress suppresses progress output	2012-02-13 13:06:53 -08:00
shortlog.c	Merge branch 'jk/format-patch-am'	2011-05-31 12:19:11 -07:00
show-branch.c	Rename resolve_ref() to resolve_ref_unsafe()	2011-12-13 09:39:46 -08:00
show-ref.c	Convert many resolve_ref() calls to read_ref*() and ref_exists()	2011-11-13 12:21:06 -08:00
stripspace.c	Update documentation for stripspace	2011-12-12 16:48:54 -08:00
symbolic-ref.c	symbolic-ref --short: abbreviate the output unambiguously	2012-02-27 15:58:36 -08:00
tag.c	Merge branch 'tg/tag-points-at'	2012-02-20 00:15:28 -08:00
tar-tree.c
unpack-file.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
unpack-objects.c	zlib: zlib can only process 4GB at a time	2011-06-10 11:52:15 -07:00
update-index.c	plug a few coverity-spotted leaks	2011-06-20 14:27:36 -07:00
update-ref.c	update-ref: whitespace fix	2011-08-25 14:42:11 -07:00
update-server-info.c
upload-archive.c	upload-archive: use start_command instead of fork	2011-11-21 14:32:40 -08:00
var.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
verify-pack.c	verify-pack: use index-pack --verify	2011-06-05 22:45:38 -07:00
verify-tag.c	verify-tag: Parse GPG configuration options.	2012-03-08 14:03:07 -08:00
write-tree.c