Mehul Jain f66398eb57 pull --rebase: add --[no-]autostash flag ...

If rebase.autoStash configuration variable is set, there is no way to
override it for "git pull --rebase" from the command line.

Teach "git pull --rebase" the --[no-]autostash command line flag which
overrides the current value of rebase.autoStash, if set. As "git rebase"
understands the --[no-]autostash option, it's just a matter of passing
the option to underlying "git rebase" when "git pull --rebase" is called.

Helped-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Helped-by: Junio C Hamano <gitster@pobox.com>
Helped-by: Paul Tan <pyokagan@gmail.com>
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Mehul Jain <mehul.jain2029@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2016-03-21 13:30:36 -07: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 'jc/am-i-v-fix'

2016-02-24 13:26:01 -08:00

annotate.c

annotate: use argv_array

2014-07-16 11:10:11 -07:00

apply.c

Merge branch 'jk/tighten-alloc'

2016-02-26 13:37:16 -08:00

archive.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

bisect--helper.c

Replace deprecated OPT_BOOLEAN by OPT_BOOL

2013-08-05 11:32:19 -07:00

blame.c

Merge branch 'jk/tighten-alloc'

2016-02-26 13:37:16 -08:00

branch.c

config: rename git_config_set_or_die to git_config_set

2016-02-22 10:23:55 -08:00

bundle.c

bundle: verify arguments more strictly

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

cat-file.c

cat-file: read batch stream with strbuf_getline()

2016-01-15 10:35:06 -08:00

check-attr.c

give "nbuf" strbuf a more meaningful name

2016-02-01 13:43:02 -08:00

check-ignore.c

give "nbuf" strbuf a more meaningful name

2016-02-01 13:43:02 -08:00

check-mailmap.c

strbuf: introduce strbuf_getline_{lf,nul}()

2016-01-15 10:12:51 -08:00

check-ref-format.c

use xmallocz to avoid size arithmetic

2016-02-22 14:51:09 -08:00

checkout-index.c

checkout-index: disallow "--no-stage" option

2016-02-01 13:43:49 -08:00

checkout.c

builtin/checkout.c: mark strings for translation

2016-02-29 14:27:58 -08:00

clean.c

Merge branch 'jk/tighten-alloc'

2016-02-26 13:37:16 -08:00

clone.c

builtin/clone.c: mark strings for translation

2016-02-29 14:27:58 -08:00

column.c

column: read lines with strbuf_getline()

2016-01-15 10:35:07 -08:00

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

Merge branch 'js/config-set-in-non-repository'

2016-02-26 13:37:26 -08:00

count-objects.c

prepare_packed_git(): refactor garbage reporting in pack directory

2015-08-17 09:14:59 -07:00

credential.c

…

describe.c

Remove get_object_hash.

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

diff-files.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

diff-index.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

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

convert trivial cases to ALLOC_ARRAY

2016-02-22 14:51:09 -08:00

fetch-pack.c

Merge branch 'jk/tighten-alloc'

2016-02-26 13:37:16 -08:00

fetch.c

Merge branch 'jk/tighten-alloc'

2016-02-26 13:37:16 -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 'jk/tighten-alloc'

2016-02-26 13:37:16 -08:00

hash-object.c

Merge branch 'jk/options-cleanup'

2016-02-10 14:20:08 -08:00

help.c

convert trivial cases to FLEX_ARRAY macros

2016-02-22 14:51:09 -08:00

index-pack.c

Merge branch 'jk/pack-idx-corruption-safety'

2016-03-04 13:45:47 -08:00

init-db.c

config: rename git_config_set_or_die to git_config_set

2016-02-22 10:23:55 -08:00

interpret-trailers.c

interpret-trailers: add option for in-place editing

2016-01-14 12:22:17 -08:00

log.c

format-patch: introduce format.outputDirectory configuration

2016-01-13 10:55:01 -08:00

ls-files.c

Merge branch 'jk/options-cleanup'

2016-02-10 14:20:08 -08:00

ls-remote.c

ls-remote: add support for showing symrefs

2016-01-19 10:07:56 -08: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 trivial cases to ALLOC_ARRAY

2016-02-22 14:51:09 -08: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

use xmallocz to avoid size arithmetic

2016-02-22 14:51:09 -08:00

merge.c

use st_add and st_mult for allocation size computation

2016-02-22 14:51:09 -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

Merge branch 'jk/tighten-alloc'

2016-02-26 13:37:16 -08:00

mv.c

use st_add and st_mult for allocation size computation

2016-02-22 14:51:09 -08:00

name-rev.c

Remove get_object_hash.

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

notes.c

Merge branch 'jk/notes-merge-from-anywhere'

2016-02-03 14:15:59 -08:00

pack-objects.c

Merge branch 'jk/tighten-alloc'

2016-02-26 13:37:16 -08:00

pack-redundant.c

convert trivial cases to ALLOC_ARRAY

2016-02-22 14:51:09 -08:00

pack-refs.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

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

standardize usage info string format

2015-01-14 09:32:04 -08:00

prune.c

Merge branch 'jk/repository-extension' into maint

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

pull.c

pull --rebase: add --[no-]autostash flag

2016-03-21 13:30:36 -07:00

push.c

Merge branch 'mm/push-default-warning'

2016-02-26 13:37:25 -08:00

read-tree.c

convert trivial sprintf / strcpy calls to xsnprintf

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

receive-pack.c

use st_add and st_mult for allocation size computation

2016-02-22 14:51:09 -08:00

reflog.c

convert trivial cases to FLEX_ARRAY macros

2016-02-22 14:51:09 -08:00

remote-ext.c

convert manual allocations to argv_array

2016-02-22 14:50:32 -08:00

remote-fd.c

…

remote.c

Merge branch 'ps/config-error'

2016-02-26 13:37:19 -08:00

repack.c

strbuf: introduce strbuf_getline_{lf,nul}()

2016-01-15 10:12:51 -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

list-objects: pass full pathname to callbacks

2016-02-12 12:51:17 -08:00

rev-parse.c

Merge branch 'nd/git-common-dir-fix'

2016-02-24 13:25:53 -08:00

revert.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

rm.c

Merge branch 'nd/ita-cleanup' into maint

2016-02-22 13:10:21 -08:00

send-pack.c

send-pack: read list of refs with strbuf_getline()

2016-01-15 10:35:07 -08:00

shortlog.c

Merge branch 'jk/shortlog'

2016-01-28 16:10:14 -08: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

stripspace: call U+0020 a "space" instead of a "blank"

2016-01-29 16:02:34 -08:00

submodule--helper.c

submodule helper list: respect correct path prefix

2016-02-24 14:33:02 -08:00

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

Merge branch 'jk/options-cleanup'

2016-02-10 14:20:08 -08:00

update-ref.c

tag, update-ref: improve description of option "create-reflog"

2015-09-11 09:50:02 -07:00

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-commit: add option to print raw gpg status information

2015-06-22 14:20:47 -07:00

verify-pack.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

verify-tag.c

verify-tag: add option to print raw gpg status information

2015-06-22 14:20:47 -07:00

worktree.c

Merge branch 'jk/tighten-alloc'

2016-02-26 13:37:16 -08:00

write-tree.c

…