diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-11-24 15:55:05 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-11-24 15:55:05 -0800 |
commit | 786f174dab50ea5333fadd1650aa709927a3099f (patch) | |
tree | 6a4a40b08368f017026473c620e028dfb7697f23 /test-delta.c | |
parent | Merge branch 'en/and-cascade-tests' (diff) | |
parent | git-branch.txt: mention --set-upstream as a way to change upstream configuration (diff) | |
download | tgif-786f174dab50ea5333fadd1650aa709927a3099f.tar.xz |
Merge branch 'mm/phrase-remote-tracking'
* mm/phrase-remote-tracking:
git-branch.txt: mention --set-upstream as a way to change upstream configuration
user-manual: remote-tracking can be checked out, with detached HEAD
user-manual.txt: explain better the remote(-tracking) branch terms
Change incorrect "remote branch" to "remote tracking branch" in C code
Change incorrect uses of "remote branch" meaning "remote-tracking"
Change "tracking branch" to "remote-tracking branch"
everyday.txt: change "tracking branch" to "remote-tracking branch"
Change remote tracking to remote-tracking in non-trivial places
Replace "remote tracking" with "remote-tracking"
Better "Changed but not updated" message in git-status
Diffstat (limited to 'test-delta.c')
0 files changed, 0 insertions, 0 deletions