summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-07-12 12:04:06 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-07-12 12:04:06 -0700
commit5b307e95e880b95eafd36e93251c6638c222dcf4 (patch)
tree0d511facc0fe5969d5b923dde557349997be5a19 /builtin/checkout.c
parentMerge branch 'jk/maint-config-multi-order' (diff)
parentpull: change the description to "integrate" changes (diff)
downloadtgif-5b307e95e880b95eafd36e93251c6638c222dcf4.tar.xz
Merge branch 'jk/pull-to-integrate'
* jk/pull-to-integrate: pull: change the description to "integrate" changes push: avoid suggesting "merging" remote changes
Diffstat (limited to 'builtin/checkout.c')
0 files changed, 0 insertions, 0 deletions