summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-10-30 20:06:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-10-30 20:06:55 (GMT)
commitf7722a447ab6121f0567cb7f211093983c300a97 (patch)
treed03a4bebcfa68b24ab1706173f875f12cb1aca51 /merge-recursive.c
parent908700c0082487f9c859b951370148ff7e8acb97 (diff)
parent29abb33978f713cd0a5cc3687bf61077b0928840 (diff)
downloadgit-f7722a447ab6121f0567cb7f211093983c300a97.zip
git-f7722a447ab6121f0567cb7f211093983c300a97.tar.gz
git-f7722a447ab6121f0567cb7f211093983c300a97.tar.bz2
Merge branch 'jc/add-u-A-default-to-top'
"git --literal-pathspecs add -u/-A" without any command line argument misbehaved ever since Git 2.0. * jc/add-u-A-default-to-top: add: simplify -u/-A without pathspec
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions