mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
f3f8311ec76f9bcdc7e26a125e585eb4e473a8d2
git/builtin
History
Nguyễn Thái Ngọc Duy f3f8311ec7 merge: add --quit 
This allows to cancel the current merge without resetting worktree/index,
which is what --abort is for. Like other --quit(s), this is often used
when you forgot that you're in the middle of a merge and already
switched away, doing different things. By the time you've realized, you
can't even continue the merge anymore.

This also makes all in-progress commands, am, merge, rebase, revert and
cherry-pick, take all three --abort, --continue and --quit (bisect has a
different UI).

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-05-19 10:47:40 +09:00
..
add.c
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
am.c
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
annotate.c
…
apply.c
…
archive.c
pack-protocol.txt: accept error packets in any context
2019-01-02 13:05:30 -08:00
bisect--helper.c
Fix typos in translatable strings for v2.21.0
2019-02-11 12:58:06 -08:00
blame.c
Merge branch 'lt/date-human'
2019-02-06 22:05:24 -08:00
branch.c
Merge branch 'tq/branch-style-fix' into maint
2018-11-21 22:58:06 +09:00
bundle.c
create_bundle(): drop unused "header" parameter
2019-01-24 12:35:44 -08:00
cat-file.c
Merge branch 'jk/loose-object-cache-oid'
2019-02-06 22:05:27 -08:00
check-attr.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
check-ignore.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
check-mailmap.c
…
check-ref-format.c
…
checkout-index.c
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
checkout.c
Merge branch 'nd/checkout-noisy-unmerge'
2019-02-08 20:44:51 -08:00
clean.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
clone.c
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
column.c
…
commit-graph.c
commit-graph: rename "large edges" to "extra edges"
2019-01-22 11:33:46 -08:00
commit-tree.c
commit-tree: add missing --gpg-sign flag
2019-01-22 11:08:35 -08:00
commit.c
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
config.c
Merge branch 'jk/save-getenv-result'
2019-01-29 12:47:54 -08:00
count-objects.c
rename "alternate_object_database" to "object_directory"
2018-11-13 14:22:02 +09:00
credential.c
…
describe.c
Merge branch 'ss/describe-dirty-in-the-right-directory'
2019-02-06 22:05:29 -08:00
diff-files.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
diff-index.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
diff-tree.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
diff.c
Merge branch 'sl/const'
2019-02-06 22:05:28 -08:00
difftool.c
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
fast-export.c
Merge branch 'en/fast-export-import'
2019-01-04 13:33:33 -08:00
fetch-pack.c
Merge branch 'jt/fetch-v2-sideband'
2019-02-05 14:26:11 -08:00
fetch.c
Fix typos in translatable strings for v2.21.0
2019-02-11 12:58:06 -08:00
fmt-merge-msg.c
…
for-each-ref.c
…
fsck.c
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
gc.c
Merge branch 'js/gc-repack-close-before-remove'
2019-01-18 13:49:57 -08:00
get-tar-commit-id.c
…
grep.c
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
hash-object.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
help.c
…
index-pack.c
convert has_sha1_file() callers to has_object_file()
2019-01-08 09:41:06 -08:00
init-db.c
Merge branch 'jk/save-getenv-result'
2019-01-29 12:47:54 -08:00
interpret-trailers.c
assert NOARG/NONEG behavior of parse-options callbacks
2018-11-06 12:56:29 +09:00
log.c
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
ls-files.c
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
ls-remote.c
Merge branch 'jk/proto-v2-ref-prefix-fix'
2018-11-13 22:37:17 +09:00
ls-tree.c
Merge branch 'nd/attr-pathspec-in-tree-walk'
2019-01-14 15:29:28 -08:00
mailinfo.c
…
mailsplit.c
…
merge-base.c
…
merge-file.c
assert NOARG/NONEG behavior of parse-options callbacks
2018-11-06 12:56:29 +09:00
merge-index.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
merge-ours.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
merge-recursive.c
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
merge-tree.c
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
merge.c
merge: add --quit
2019-05-19 10:47:40 +09:00
mktag.c
…
mktree.c
…
multi-pack-index.c
…
mv.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
name-rev.c
…
notes.c
Merge branch 'nd/the-index' into md/list-objects-filter-by-depth
2019-01-15 15:38:29 -08:00
pack-objects.c
Merge branch 'sl/const'
2019-02-06 22:05:28 -08:00
pack-redundant.c
various: tighten constness of some local variables
2019-02-04 09:57:10 -08:00
pack-refs.c
…
patch-id.c
…
prune-packed.c
…
prune.c
Merge branch 'md/exclude-promisor-objects-fix-cleanup'
2019-01-14 15:29:31 -08:00
pull.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
push.c
Merge branch 'nd/style-opening-brace'
2019-01-18 13:49:52 -08:00
range-diff.c
…
read-tree.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
rebase--interactive.c
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
rebase.c
Fix typos in translatable strings for v2.21.0
2019-02-11 12:58:06 -08:00
receive-pack.c
pack-protocol.txt: accept error packets in any context
2019-01-02 13:05:30 -08:00
reflog.c
Merge branch 'jk/loose-object-cache-oid'
2019-02-06 22:05:27 -08:00
remote-ext.c
…
remote-fd.c
…
remote.c
…
repack.c
Merge branch 'js/gc-repack-close-before-remove'
2019-01-18 13:49:57 -08:00
replace.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
rerere.c
Merge branch 'nd/the-index' into md/list-objects-filter-by-depth
2019-01-15 15:38:29 -08:00
reset.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
rev-list.c
Merge branch 'ds/push-sparse-tree-walk'
2019-02-06 22:05:25 -08:00
rev-parse.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
revert.c
Merge branch 'nd/the-index'
2019-01-04 13:33:33 -08:00
rm.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
send-pack.c
pack-protocol.txt: accept error packets in any context
2019-01-02 13:05:30 -08:00
serve.c
…
shortlog.c
Merge branch 'nd/show-gitcomp-compilation-fix' into maint
2018-12-15 12:24:33 +09:00
show-branch.c
assert NOARG/NONEG behavior of parse-options callbacks
2018-11-06 12:56:29 +09:00
show-index.c
…
show-ref.c
convert has_sha1_file() callers to has_object_file()
2019-01-08 09:41:06 -08:00
stripspace.c
stripspace: allow -s/-c outside git repository
2018-12-26 15:41:47 -08:00
submodule--helper.c
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
symbolic-ref.c
…
tag.c
assert NOARG/NONEG behavior of parse-options callbacks
2018-11-06 12:56:29 +09:00
unpack-file.c
…
unpack-objects.c
…
update-index.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
update-ref.c
…
update-server-info.c
…
upload-archive.c
…
upload-pack.c
…
var.c
…
verify-commit.c
…
verify-pack.c
…
verify-tag.c
…
worktree.c
worktree: allow to (re)move worktrees with uninitialized submodules
2019-01-07 09:26:33 -08:00
write-tree.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00