diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-07-12 12:04:06 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-07-12 12:04:06 -0700 |
commit | 5b307e95e880b95eafd36e93251c6638c222dcf4 (patch) | |
tree | 0d511facc0fe5969d5b923dde557349997be5a19 /builtin/checkout.c | |
parent | Merge branch 'jk/maint-config-multi-order' (diff) | |
parent | pull: change the description to "integrate" changes (diff) | |
download | tgif-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