Johannes Schindelin 08e9391c6a pull: allow interactive rebase with --rebase=interactive ...

A couple of years ago, I found the need to collaborate on topic
branches that were rebased all the time, and I really needed to see
what I was rebasing when pulling, so I introduced an
interactively-rebasing pull.

The way builtin pull works, this change also supports the value
'interactive' for the 'branch.<name>.rebase' config variable, which
is a neat thing because users can now configure given branches for
interactively-rebasing pulls without having to type out the complete
`--rebase=interactive` option every time they pull.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2016-02-06 14:38:56 +01:00

..

add.c

Merge branch 'jc/add-u-A-default-to-top' into maint

2015-11-05 12:18:12 -08:00

am.c

Merge branch 'nd/diff-with-path-params' into maint

2016-02-05 14:54:15 -08:00

annotate.c

…

apply.c

apply: convert root string to strbuf

2015-10-05 11:08:04 -07:00

archive.c

…

bisect--helper.c

…

blame.c

Merge branch 'bc/object-id'

2015-12-10 12:36:13 -08:00

branch.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

bundle.c

…

cat-file.c

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

check-attr.c

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

check-ignore.c

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

check-mailmap.c

…

check-ref-format.c

…

checkout-index.c

…

checkout.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

clean.c

clean: make is_git_repository a public function

2016-01-25 11:41:53 -08:00

clone.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

column.c

…

commit-tree.c

Convert struct object to object_id

2015-11-20 08:02:05 -05:00

commit.c

Merge branch 'js/fopen-harder' into maint

2016-02-05 14:54:11 -08:00

config.c

config: use xstrfmt in normalize_value

2015-09-25 10:18:18 -07:00

count-objects.c

…

credential.c

…

describe.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

diff-files.c

…

diff-index.c

…

diff-tree.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

diff.c

Merge branch 'nd/diff-with-path-params' into maint

2016-02-05 14:54:15 -08:00

fast-export.c

Merge branch 'js/fopen-harder' into maint

2016-02-05 14:54:11 -08:00

fetch-pack.c

add_sought_entry_mem: convert to struct object_id

2015-11-20 08:02:05 -05:00

fetch.c

Merge branch 'js/close-packs-before-gc' into maint

2016-02-05 14:54:13 -08:00

fmt-merge-msg.c

Merge branch 'rs/pop-commit' into maint

2015-12-11 11:14:13 -08:00

for-each-ref.c

ref-filter: add option to match literal pattern

2015-09-17 10:02:49 -07:00

fsck.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

gc.c

Merge branch 'dk/gc-idx-wo-pack' into maint

2015-12-04 11:33:08 -08:00

get-tar-commit-id.c

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

grep.c

Merge branch 'bc/object-id'

2015-12-10 12:36:13 -08:00

hash-object.c

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

help.c

convert strncpy to memcpy

2015-10-05 11:08:06 -07:00

index-pack.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

init-db.c

initdb: make safe_create_dir public

2015-11-20 04:52:01 -05:00

interpret-trailers.c

…

log.c

format-patch: add an option to suppress commit hash

2015-12-15 10:03:40 -08:00

ls-files.c

…

ls-remote.c

Convert struct ref to use object_id.

2015-11-20 08:02:05 -05:00

ls-tree.c

convert trivial sprintf / strcpy calls to xsnprintf

2015-09-25 10:18:18 -07:00

mailinfo.c

mailinfo: libify

2015-10-21 15:59:34 -07:00

mailsplit.c

mailsplit: make PATH_MAX buffers dynamic

2015-09-25 10:18:18 -07:00

merge-base.c

Convert struct object to object_id

2015-11-20 08:02:05 -05:00

merge-file.c

Merge branch 'jk/merge-file-exit-code' into maint

2015-11-03 15:32:41 -08:00

merge-index.c

use sha1_to_hex_r() instead of strcpy

2015-10-05 11:08:05 -07:00

merge-ours.c

…

merge-recursive.c

convert trivial sprintf / strcpy calls to xsnprintf

2015-09-25 10:18:18 -07:00

merge-tree.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

merge.c

merge: release pack files before garbage-collecting

2016-01-13 11:36:28 -08:00

mktag.c

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

mktree.c

…

mv.c

…

name-rev.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

notes.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

pack-objects.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

prune-packed.c

…

prune.c

Merge branch 'jk/repository-extension' into maint

2015-11-03 15:32:25 -08:00

pull.c

pull: allow interactive rebase with --rebase=interactive

2016-02-06 14:38:56 +01:00

push.c

push: don't mark options of recurse-submodules for translation

2015-12-22 14:40:47 -08:00

read-tree.c

convert trivial sprintf / strcpy calls to xsnprintf

2015-09-25 10:18:18 -07:00

receive-pack.c

Merge branch 'js/close-packs-before-gc' into maint

2016-02-05 14:54:13 -08:00

reflog.c

Merge branch 'rs/pop-commit' into maint

2015-12-11 11:14:13 -08:00

remote-ext.c

remote-ext: simplify git pkt-line generation

2015-09-25 10:18:18 -07:00

remote-fd.c

…

remote.c

ref_newer: convert to use struct object_id

2015-11-20 08:02:05 -05:00

repack.c

Merge branch 'jk/repository-extension' into maint

2015-11-03 15:32:25 -08:00

replace.c

Convert struct object to object_id

2015-11-20 08:02:05 -05:00

rerere.c

Sync with 2.6.1

2015-10-05 13:20:08 -07:00

reset.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

rev-list.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

rev-parse.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

revert.c

…

rm.c

…

send-pack.c

…

shortlog.c

Convert struct object to object_id

2015-11-20 08:02:05 -05:00

show-branch.c

Merge branch 'rs/show-branch-argv-array' into maint

2015-12-11 11:14:14 -08:00

show-ref.c

show-ref: stop using PARSE_OPT_NO_INTERNAL_HELP

2015-11-20 08:02:07 -05:00

stripspace.c

Merge branch 'jc/usage-stdin' into maint

2015-11-03 15:32:38 -08:00

submodule--helper.c

…

symbolic-ref.c

symbolic-ref: propagate error code from create_symref()

2015-12-21 12:03:03 -08:00

tag.c

tag: do not show ambiguous tag names as "tags/foo"

2016-01-26 13:34:10 -08:00

unpack-file.c

convert trivial sprintf / strcpy calls to xsnprintf

2015-09-25 10:18:18 -07:00

unpack-objects.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

update-index.c

…

update-ref.c

…

update-server-info.c

…

upload-archive.c

upload-archive: convert sprintf to strbuf

2015-09-25 10:18:18 -07:00

var.c

…

verify-commit.c

…

verify-pack.c

…

verify-tag.c

…

worktree.c

Convert struct object to object_id

2015-11-20 08:02:05 -05:00

write-tree.c

…