1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-05 00:37:55 +01:00
git/builtin
Pat Notz 89ac1223c0 commit: --squash option for use with rebase --autosquash
This option makes it convenient to construct commit messages for use
with 'rebase --autosquash'.  The resulting commit message will be
"squash! ..." where "..." is the subject line of the specified commit
message.  This option can be used with other commit message options
such as -m, -c, -C and -F.

If an editor is invoked (as with -c or -eF or no message options) the
commit message is seeded with the correctly formatted subject line.

Example usage:
  $ git commit --squash HEAD~2
  $ git commit --squash HEAD~2 -m "clever comment"
  $ git commit --squash HEAD~2 -F msgfile
  $ git commit --squash HEAD~2 -C deadbeef

Signed-off-by: Pat Notz <patnotz@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-04 13:53:35 -07:00
..
add.c
annotate.c
apply.c Merge branch 'jn/apply-filename-with-sp' 2010-09-03 09:43:44 -07:00
archive.c
bisect--helper.c
blame.c Merge branch 'maint' 2010-08-22 20:18:37 -07:00
branch.c
bundle.c bundle: run setup_git_directory_gently() sooner 2010-08-15 19:57:33 -07:00
cat-file.c
check-attr.c
check-ref-format.c Allow "check-ref-format --branch" from subdirectory 2010-08-06 10:01:45 -07:00
checkout-index.c
checkout.c Improvements to git checkout -h 2010-09-27 10:54:17 -07:00
clean.c builtin/clean.c: Use STRING_LIST_INIT_NODUP. 2010-09-06 16:56:51 -07:00
clone.c clone: warn users --depth is ignored in local clones 2010-08-24 09:28:02 -07:00
commit-tree.c
commit.c commit: --squash option for use with rebase --autosquash 2010-11-04 13:53:35 -07:00
config.c Merge branch 'jn/paginate-fix' 2010-08-31 16:23:31 -07:00
count-objects.c
describe.c
diff-files.c Submodules: Use "ignore" settings from .gitmodules too for diff and status 2010-08-09 09:11:44 -07:00
diff-index.c Submodules: Use "ignore" settings from .gitmodules too for diff and status 2010-08-09 09:11:44 -07:00
diff-tree.c Submodules: Use "ignore" settings from .gitmodules too for diff and status 2010-08-09 09:11:44 -07:00
diff.c Submodules: Use "ignore" settings from .gitmodules too for diff and status 2010-08-09 09:11:44 -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 builtin/fetch.c: comment that branch->remote_name is usable when has_merge 2010-09-09 17:15:58 -07:00
fmt-merge-msg.c Merge branch 'rr/fmt-merge-msg' 2010-09-29 13:48:20 -07:00
for-each-ref.c for-each-ref: fix objectname:short bug 2010-08-26 16:42:25 -07:00
fsck.c
gc.c
grep.c Merge branch 'jn/paginate-fix' 2010-08-31 16:23:31 -07:00
hash-object.c
help.c Cast execl*() NULL sentinels to (char *) 2010-07-25 23:14:18 -07:00
index-pack.c do not depend on signed integer overflow 2010-10-06 11:10:07 -07:00
init-db.c init: plug tiny one-time memory leak 2010-10-06 10:46:05 -07:00
log.c commit: helper methods to reduce redundant blocks of code 2010-11-04 13:53:34 -07:00
ls-files.c Merge branch 'ar/string-list-foreach' 2010-08-18 12:14:38 -07:00
ls-remote.c ls-remote: run setup_git_directory_gently() sooner 2010-08-15 20:00:02 -07:00
ls-tree.c ls-tree $di $dir: do not mistakenly recurse into directories 2010-09-12 13:52:03 -07:00
mailinfo.c commit: helper methods to reduce redundant blocks of code 2010-11-04 13:53:34 -07:00
mailsplit.c
merge-base.c merge-base --independent to print reduced parent list in a merge 2010-08-18 14:02:03 -07:00
merge-file.c merge-file: run setup_git_directory_gently() sooner 2010-08-15 20:00:03 -07:00
merge-index.c
merge-ours.c
merge-recursive.c Merge branch 'jn/merge-renormalize' 2010-09-03 09:43:41 -07:00
merge-tree.c
merge.c Merge branch 'rr/fmt-merge-msg' 2010-09-29 13:48:20 -07:00
mktag.c
mktree.c
mv.c
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 notes: Don't create (empty) commit when removing non-existing notes 2010-08-31 11:07:34 -07:00
pack-objects.c do not depend on signed integer overflow 2010-10-06 11:10:07 -07:00
pack-redundant.c
pack-refs.c
patch-id.c
prune-packed.c
prune.c prune: allow --dry-run for -n and --verbose for -v 2010-08-09 10:13:18 -07:00
push.c Merge branch 'maint' 2010-08-12 18:07:09 -07:00
read-tree.c read-tree: deprecate syntax without tree-ish args 2010-09-10 08:37:14 -07:00
receive-pack.c
reflog.c
remote.c
replace.c
rerere.c Merge branch 'jn/merge-renormalize' 2010-09-03 09:43:41 -07:00
reset.c reset: suggest what to do upon "git reset --mixed <paths>" 2010-08-21 23:17:35 -07:00
rev-list.c
rev-parse.c
revert.c builtin/revert.c: don't dereference a NULL pointer 2010-09-27 10:39:54 -07:00
rm.c
send-pack.c
shortlog.c shortlog: run setup_git_directory_gently() sooner 2010-08-11 09:24:01 -07:00
show-branch.c
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
update-ref.c
update-server-info.c
upload-archive.c
var.c var: run setup_git_directory_gently() sooner 2010-08-15 20:00:02 -07:00
verify-pack.c
verify-tag.c
write-tree.c