aboutsummaryrefslogtreecommitdiffstats
path: root/notes.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-12-01 12:47:01 -0800
committerJunio C Hamano <gitster@pobox.com>2009-12-01 12:47:01 -0800
commit36a83f375bc247a09f46de0445a138d5e6de8a4f (patch)
treee64aafa7ba59dedb651aa79b4b96483b855089af /notes.c
parentMerge branch 'bw/remote-get-ref-states-fix' (diff)
parentgit-merge: a deprecation notice of the ancient command line syntax (diff)
downloadgit-36a83f375bc247a09f46de0445a138d5e6de8a4f.tar.gz
git-36a83f375bc247a09f46de0445a138d5e6de8a4f.zip
Merge branch 'jc/deprecate-old-syntax-from-merge'
* jc/deprecate-old-syntax-from-merge: git-merge: a deprecation notice of the ancient command line syntax
Diffstat (limited to 'notes.c')
0 files changed, 0 insertions, 0 deletions