summaryrefslogtreecommitdiff
path: root/builtin/merge-index.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-12-04 21:34:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-12-04 21:34:10 (GMT)
commitfb4c62235fee8008d99ef55c4adcb1f7ea9508a3 (patch)
treee4ef44ddad2918505339de1b584506d46a792756 /builtin/merge-index.c
parentee26a6e2b87905ac605c27841f607cb3379ca678 (diff)
parent552755a88b3b4c28166336a0f4ffac08cf43fb89 (diff)
downloadgit-fb4c62235fee8008d99ef55c4adcb1f7ea9508a3.zip
git-fb4c62235fee8008d99ef55c4adcb1f7ea9508a3.tar.gz
git-fb4c62235fee8008d99ef55c4adcb1f7ea9508a3.tar.bz2
Merge branch 'mm/status-push-pull-advise'
* mm/status-push-pull-advise: document that statusHints affects git checkout
Diffstat (limited to 'builtin/merge-index.c')
0 files changed, 0 insertions, 0 deletions