mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
93fc8760e7a29ce9e93c90c63523f0c1f25498bb
git/builtin
History
Junio C Hamano 640f9cd599 Merge branch 'dl/rebase-i-keep-base' 
"git rebase --keep-base <upstream>" tries to find the original base
of the topic being rebased and rebase on top of that same base,
which is useful when running the "git rebase -i" (and its limited
variant "git rebase -x").

The command also has learned to fast-forward in more cases where it
can instead of replaying to recreate identical commits.

* dl/rebase-i-keep-base:
  rebase: teach rebase --keep-base
  rebase tests: test linear branch topology
  rebase: fast-forward --fork-point in more cases
  rebase: fast-forward --onto in more cases
  rebase: refactor can_fast_forward into goto tower
  t3432: test for --no-ff's interaction with fast-forward
  t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests
  t3432: test rebase fast-forward behavior
  t3431: add rebase --fork-point tests
2019-09-30 13:19:31 +09:00
..
add.c
add: error appropriately on repository with no commits
2019-04-10 12:52:50 +09:00
am.c
git-am: handle missing "author" when parsing commit
2019-09-06 11:03:39 -07: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
bisect--helper: verify HEAD could be parsed before continuing
2019-05-28 10:51:01 -07:00
blame.c
Merge branch 'br/blame-ignore'
2019-07-19 11:30:20 -07:00
branch.c
Merge branch 'po/doc-branch' into maint
2019-07-29 12:38:16 -07:00
bundle.c
create_bundle(): drop unused "header" parameter
2019-01-24 12:35:44 -08:00
cat-file.c
Merge branch 'cc/multi-promisor'
2019-09-18 11:50:09 -07: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/switch-and-restore'
2019-09-30 13:19:27 +09:00
clean.c
clean: show an error message when the path is too long
2019-07-19 08:12:44 -07:00
clone.c
Merge branch 'md/list-objects-filter-combo'
2019-09-18 11:50:09 -07:00
column.c
builtin: consistently pass cmd_* prefix to parse_options
2019-05-13 14:22:53 +09:00
commit-graph.c
commit-graph: error out on invalid commit oids in 'write --stdin-commits'
2019-08-05 14:33:39 -07:00
commit-tree.c
commit-tree: utilize parse-options api
2019-03-08 10:31:24 +09:00
commit.c
Merge branch 'ds/close-object-store' into maint
2019-07-29 12:38:22 -07:00
config.c
Merge branch 'jk/save-getenv-result'
2019-01-29 12:47:54 -08:00
count-objects.c
…
credential.c
…
describe.c
use get_tagged_oid()
2019-09-05 14:11:34 -07: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
Merge branch 'en/combined-all-paths'
2019-03-07 09:59:54 +09:00
diff.c
Merge branch 'nd/diff-parseopt-4'
2019-04-25 16:41:12 +09:00
difftool.c
Merge branch 'js/difftool-no-index'
2019-05-19 16:45:35 +09:00
env--helper.c
env--helper: mark a file-local symbol as static
2019-07-11 14:31:04 -07:00
fast-export.c
object: convert lookup_object() to use object_id
2019-06-20 10:18:09 -07:00
fetch-pack.c
fetch_pack(): drop unused parameters
2019-03-20 18:34:09 +09:00
fetch.c
Merge branch 'md/list-objects-filter-combo'
2019-09-18 11:50:09 -07:00
fmt-merge-msg.c
…
for-each-ref.c
parse_opt_ref_sorting: always use with NONEG flag
2019-03-21 12:03:35 +09:00
fsck.c
object: convert lookup_object() to use object_id
2019-06-20 10:18:09 -07:00
gc.c
Merge branch 'cc/multi-promisor'
2019-09-18 11:50:09 -07:00
get-tar-commit-id.c
builtin/get-tar-commit-id: make hash size independent
2019-04-01 11:57:39 +09:00
grep.c
grep: use return value of strbuf_detach()
2019-08-26 11:32:28 -07:00
hash-object.c
builtin: consistently pass cmd_* prefix to parse_options
2019-05-13 14:22:53 +09:00
help.c
completion: add more parameter value completion
2019-02-20 12:31:56 -08:00
index-pack.c
Use promisor_remote_get_direct() and has_promisor_remote()
2019-06-25 14:05:37 -07:00
init-db.c
Merge branch 'nd/init-relative-template-fix' into maint
2019-07-25 14:27:06 -07:00
interpret-trailers.c
interpret-trailers: load default config
2019-06-19 07:12:49 -07:00
log.c
use get_tagged_oid()
2019-09-05 14:11:34 -07:00
ls-files.c
cleanup: fix possible overflow errors in binary search, part 2
2019-06-13 11:28:53 -07:00
ls-remote.c
parse_opt_ref_sorting: always use with NONEG flag
2019-03-21 12:03:35 +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
…
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 'jk/tree-walk-overflow'
2019-08-22 12:34:10 -07:00
merge.c
merge: --no-verify to bypass pre-merge-commit hook
2019-08-07 12:37:33 -07:00
mktag.c
…
mktree.c
mktree: drop unused length parameter
2019-05-13 14:22:54 +09:00
multi-pack-index.c
multi-pack-index: prepare 'repack' subcommand
2019-06-11 10:34:40 -07:00
mv.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
name-rev.c
object: convert lookup_object() to use object_id
2019-06-20 10:18:09 -07:00
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 'jk/misc-uninitialized-fixes'
2019-09-30 13:19:30 +09:00
pack-redundant.c
object-store: rename and expand packed_git's sha1 member
2019-04-01 11:57:38 +09:00
pack-refs.c
Honor core.precomposeUnicode in more places
2019-04-26 10:54:03 +09:00
patch-id.c
format-patch: make --base patch-id output stable
2019-05-08 19:27:43 +09:00
prune-packed.c
Merge branch 'rj/prune-packed-excess-args'
2019-03-07 09:59:55 +09:00
prune.c
object: convert lookup_object() to use object_id
2019-06-20 10:18:09 -07:00
pull.c
pull, fetch: add --set-upstream option
2019-08-19 13:05:58 -07:00
push.c
Merge branch 'tg/push-all-in-mirror-forbidden'
2019-09-30 13:19:28 +09:00
range-diff.c
builtin: consistently pass cmd_* prefix to parse_options
2019-05-13 14:22:53 +09:00
read-tree.c
cmd_{read,write}_tree: rename "unused" variable that is used
2019-05-13 14:22:53 +09:00
rebase.c
Merge branch 'dl/rebase-i-keep-base'
2019-09-30 13:19:31 +09:00
receive-pack.c
Merge branch 'ds/close-object-store' into maint
2019-07-29 12:38:22 -07: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
remove_all_fetch_refspecs(): drop unused "remote" parameter
2019-05-13 14:22:54 +09:00
repack.c
Merge branch 'cc/multi-promisor'
2019-09-18 11:50:09 -07:00
replace.c
use get_tagged_oid()
2019-09-05 14:11:34 -07: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
Merge branch 'nd/tree-walk-with-repo'
2019-07-19 11:30:21 -07:00
rev-list.c
Merge branch 'md/list-objects-filter-combo'
2019-09-18 11:50:09 -07: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 'ra/cherry-pick-revert-skip'
2019-07-19 11:30:21 -07:00
rm.c
Merge branch 'jc/denoise-rm-to-resolve' into maint
2019-07-29 12:38:17 -07:00
send-pack.c
pack-protocol.txt: accept error packets in any context
2019-01-02 13:05:30 -08:00
shortlog.c
Merge branch 'nd/show-gitcomp-compilation-fix' into maint
2018-12-15 12:24:33 +09:00
show-branch.c
show-branch: drop unused parameter from show_independent()
2019-05-13 14:22:54 +09:00
show-index.c
…
show-ref.c
Merge branch 'en/unicode-in-refnames'
2019-05-19 16:45:30 +09:00
stash.c
Merge branch 'tg/stash-keep-index-with-removed-paths'
2019-07-25 13:59:23 -07:00
stripspace.c
stripspace: allow -s/-c outside git repository
2018-12-26 15:41:47 -08:00
submodule--helper.c
Merge branch 'ms/submodule-foreach-fix' into maint
2019-07-29 12:38:18 -07:00
symbolic-ref.c
…
tag.c
tag: add tag.gpgSign config option to force all tags be GPG-signed
2019-06-05 14:39:28 -07:00
unpack-file.c
…
unpack-objects.c
object: convert lookup_object() to use object_id
2019-06-20 10:18:09 -07:00
update-index.c
repo-settings: parse core.untrackedCache
2019-08-13 13:33:55 -07:00
update-ref.c
…
update-server-info.c
…
upload-archive.c
…
upload-pack.c
builtin: consistently pass cmd_* prefix to parse_options
2019-05-13 14:22:53 +09:00
var.c
…
verify-commit.c
Merge branch 'jk/no-system-includes-in-dot-c'
2019-07-31 14:38:56 -07:00
verify-pack.c
…
verify-tag.c
verify-tag: drop signal.h include
2019-06-19 08:19:21 -07:00
worktree.c
worktree remove: clarify error message on dirty worktree
2019-08-13 13:10:09 -07:00
write-tree.c
cmd_{read,write}_tree: rename "unused" variable that is used
2019-05-13 14:22:53 +09:00