summaryrefslogtreecommitdiff
path: root/t/t4013/diff.diff-tree_--root_initial
diff options
context:
space:
mode:
authorLibravatar Linus Torvalds <torvalds@linux-foundation.org>2012-02-11 10:21:03 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-12 19:24:47 -0800
commit8580830084c8917ac41d18e39dba276b237f598e (patch)
treed4622571e60b66a2ce3dc782e9ca8a889d94ab32 /t/t4013/diff.diff-tree_--root_initial
parentMerge branch 'jc/merge-ff-only-stronger-than-signed-merge' (diff)
downloadtgif-8580830084c8917ac41d18e39dba276b237f598e.tar.xz
"git pull" doesn't know "--edit"
Ok, so now "git merge" defaults to editing when interactive - lovely. But when testing that, I noticed that while you can say git merge --[no-]edit ..branch.. that does not work with "git pull". You get a message like error: unknown option `no-edit' usage: git fetch [<options>] [<repository> [<refspec>...]] or: git fetch [<options>] <group> or: git fetch --multiple [<options>] [(<repository> | <group>)...] or: git fetch --all [<options>] -v, --verbose be more verbose -q, --quiet be more quiet --all fetch from all remotes ... which is because that stupid shell script doesn't know about the new flags, and just passes it to "git fetch" instead. Now, I really wanted to just make "git pull" a built-in instead of that nasty shell script, but I'm lazy. So here's the trivial updates to git-pull.sh to at least teach it about -e/--edit/--no-edit. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.diff-tree_--root_initial')
0 files changed, 0 insertions, 0 deletions