admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
1131ec98189e993dcc48043c4f8e8b0128f52055
git/builtin
History
Johannes Schindelin 1131ec9818 pull: accept --rebase=merges to recreate the branch topology 
Similar to the `preserve` mode simply passing the `--preserve-merges`
option to the `rebase` command, the `merges` mode simply passes the
`--rebase-merges` option.

This will allow users to conveniently rebase non-trivial commit
topologies when pulling new commits, without flattening them.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-04-26 12:28:43 +09:00
..
add.c
exec_cmd: rename to use dash in file name
2018-04-11 18:11:00 +09:00
am.c
exec_cmd: rename to use dash in file name
2018-04-11 18:11:00 +09:00
annotate.c
…
apply.c
apply: move lockfile into apply_state
2017-10-06 10:07:18 +09:00
archive.c
correct error messages for NULL packet_read_line()
2018-02-08 12:37:30 -08:00
bisect--helper.c
bisect: mention "view" as an alternative to "visualize"
2017-11-13 10:51:14 +09:00
blame.c
Merge branch 'ps/contains-id-error-message'
2018-04-10 16:28:20 +09:00
branch.c
Merge branch 'bc/object-id'
2018-04-10 08:25:45 +09:00
bundle.c
…
cat-file.c
sha1_file: convert read_sha1_file to struct object_id
2018-03-14 09:23:50 -07:00
check-attr.c
…
check-ignore.c
check-ignore: fix mix of directories and other file types
2018-02-12 13:09:35 -08:00
check-mailmap.c
…
check-ref-format.c
Merge branch 'jc/check-ref-format-oor' into maint
2017-11-15 12:04:57 +09:00
checkout-index.c
parse-options: let OPT__FORCE take optional flags argument
2018-02-09 10:24:50 -08:00
checkout.c
Merge branch 'bc/object-id'
2018-04-10 08:25:45 +09:00
clean.c
completion: use __gitcomp_builtin in _git_clean
2018-02-09 10:24:50 -08:00
clone.c
object-store: close all packs upon clearing the object store
2018-03-26 10:05:55 -07:00
column.c
…
commit-tree.c
sha1_file: convert assert_sha1_type to object_id
2018-03-14 09:23:49 -07:00
commit.c
Merge branch 'bw/commit-partial-from-subdirectory-fix'
2018-04-25 13:28:53 +09:00
config.c
config: change default of pager.config to "on"
2018-02-21 14:27:30 -08:00
count-objects.c
packfile: keep prepare_packed_git() private
2018-03-26 10:07:43 -07:00
credential.c
…
describe.c
exec_cmd: rename to use dash in file name
2018-04-11 18:11:00 +09:00
diff-files.c
…
diff-index.c
Merge branch 'ma/builtin-unleak'
2017-10-07 16:27:55 +09:00
diff-tree.c
object: rename function 'typename' to 'type_name'
2018-02-14 13:10:05 -08:00
diff.c
Switch empty tree and blob lookups to use hash abstraction
2017-11-13 13:20:44 +09:00
difftool.c
exec_cmd: rename to use dash in file name
2018-04-11 18:11:00 +09:00
fast-export.c
sha1_file: convert read_sha1_file to struct object_id
2018-03-14 09:23:50 -07:00
fetch-pack.c
fetch: inherit filter-spec from partial clone
2017-12-08 09:58:52 -08:00
fetch.c
Merge branch 'sb/object-store'
2018-04-11 13:09:55 +09:00
fmt-merge-msg.c
sha1_file: convert read_sha1_file to struct object_id
2018-03-14 09:23:50 -07:00
for-each-ref.c
provide --color option for all ref-filter users
2017-10-04 11:35:29 +09:00
fsck.c
Merge branch 'sb/packfiles-in-repository'
2018-04-11 13:09:55 +09:00
gc.c
Merge branch 'sb/packfiles-in-repository'
2018-04-11 13:09:55 +09:00
get-tar-commit-id.c
distinguish error versus short read from read_in_full()
2017-09-27 15:45:24 +09:00
grep.c
Merge branch 'sb/object-store'
2018-04-11 13:09:55 +09:00
hash-object.c
exec_cmd: rename to use dash in file name
2018-04-11 18:11:00 +09:00
help.c
exec_cmd: rename to use dash in file name
2018-04-11 18:11:00 +09:00
index-pack.c
sha1_file.c: rename to use dash in file name
2018-04-11 18:11:00 +09:00
init-db.c
exec_cmd: rename to use dash in file name
2018-04-11 18:11:00 +09:00
interpret-trailers.c
…
log.c
sha1_file: convert read_sha1_file to struct object_id
2018-03-14 09:23:50 -07:00
ls-files.c
Convert find_unique_abbrev* to struct object_id
2018-03-14 09:23:48 -07:00
ls-remote.c
completion: use __gitcomp_builtin in _git_ls_remote
2018-02-09 10:24:51 -08:00
ls-tree.c
sha1_file: convert sha1_object_info* to object_id
2018-03-14 09:23:49 -07:00
mailinfo.c
…
mailsplit.c
…
merge-base.c
Merge branch 'ma/reduce-heads-leakfix'
2017-11-15 12:14:32 +09:00
merge-file.c
…
merge-index.c
…
merge-ours.c
Merge branch 'bw/diff-opt-impl-to-bitfields'
2017-11-09 14:31:27 +09:00
merge-recursive.c
…
merge-tree.c
exec_cmd: rename to use dash in file name
2018-04-11 18:11:00 +09:00
merge.c
Merge branch 'sb/object-store'
2018-04-11 13:09:55 +09:00
mktag.c
Convert lookup_replace_object to struct object_id
2018-03-14 09:23:50 -07:00
mktree.c
sha1_file: convert sha1_object_info* to object_id
2018-03-14 09:23:49 -07:00
mv.c
Merge branch 'sm/mv-dry-run-update' into maint
2018-03-22 14:24:25 -07:00
name-rev.c
Convert find_unique_abbrev* to struct object_id
2018-03-14 09:23:48 -07:00
notes.c
exec_cmd: rename to use dash in file name
2018-04-11 18:11:00 +09:00
pack-objects.c
Merge branch 'sb/packfiles-in-repository'
2018-04-11 13:09:55 +09:00
pack-redundant.c
Merge branch 'sb/packfiles-in-repository'
2018-04-11 13:09:55 +09:00
pack-refs.c
…
patch-id.c
…
prune-packed.c
…
prune.c
sha1_file: convert sha1_object_info* to object_id
2018-03-14 09:23:49 -07:00
pull.c
pull: accept --rebase=merges to recreate the branch topology
2018-04-26 12:28:43 +09:00
push.c
completion: use __gitcomp_builtin in _git_push
2018-02-09 10:24:52 -08:00
read-tree.c
…
rebase--helper.c
rebase-helper --make-script: introduce a flag to rebase merges
2018-04-26 12:28:42 +09:00
receive-pack.c
exec_cmd: rename to use dash in file name
2018-04-11 18:11:00 +09:00
reflog.c
Merge branch 'bc/object-id'
2018-04-10 08:25:45 +09:00
remote-ext.c
consistently use "fallthrough" comments in switches
2017-09-22 12:49:57 +09:00
remote-fd.c
…
remote.c
pull: accept --rebase=merges to recreate the branch topology
2018-04-26 12:28:43 +09:00
repack.c
gc: do not repack promisor packfiles
2017-12-08 09:52:42 -08:00
replace.c
Merge branch 'bc/object-id'
2018-04-10 08:25:45 +09:00
rerere.c
avoid "write_in_full(fd, buf, len) != len" pattern
2017-09-14 15:17:59 +09:00
reset.c
Convert find_unique_abbrev* to struct object_id
2018-03-14 09:23:48 -07:00
rev-list.c
Merge branch 'bc/object-id'
2018-04-10 08:25:45 +09:00
rev-parse.c
Convert find_unique_abbrev* to struct object_id
2018-03-14 09:23:48 -07:00
revert.c
sequencer: improve config handling
2017-12-13 11:15:14 -08:00
rm.c
Merge branch 'bc/object-id'
2018-04-10 08:25:45 +09:00
send-pack.c
…
shortlog.c
Merge branch 'ps/contains-id-error-message'
2018-04-10 16:28:20 +09:00
show-branch.c
Convert find_unique_abbrev* to struct object_id
2018-03-14 09:23:48 -07:00
show-ref.c
Convert find_unique_abbrev* to struct object_id
2018-03-14 09:23:48 -07:00
stripspace.c
…
submodule--helper.c
Merge branch 'rs/status-with-removed-submodule'
2018-04-11 13:09:56 +09:00
symbolic-ref.c
refs: rename constant REF_NODEREF to REF_NO_DEREF
2017-11-06 10:31:08 +09:00
tag.c
Merge branch 'jk/ref-array-push'
2018-04-25 13:28:59 +09:00
unpack-file.c
sha1_file: convert read_sha1_file to struct object_id
2018-03-14 09:23:50 -07:00
unpack-objects.c
Merge branch 'bc/object-id'
2018-04-10 08:25:45 +09:00
update-index.c
Merge branch 'ps/contains-id-error-message'
2018-04-10 16:28:20 +09:00
update-ref.c
refs: rename constant REF_NODEREF to REF_NO_DEREF
2017-11-06 10:31:08 +09:00
update-server-info.c
parse-options: let OPT__FORCE take optional flags argument
2018-02-09 10:24:50 -08:00
upload-archive.c
…
var.c
…
verify-commit.c
sha1_file: convert read_sha1_file to struct object_id
2018-03-14 09:23:50 -07:00
verify-pack.c
…
verify-tag.c
ref-filter: use "struct object_id" consistently
2018-04-09 06:14:45 +09:00
worktree.c
Merge branch 'nd/worktree-prune'
2018-04-10 08:25:45 +09:00
write-tree.c
cache-tree: convert write_*_as_tree to object_id
2018-03-14 09:23:47 -07:00