summaryrefslogtreecommitdiff
path: root/builtin/read-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-11-24 15:55:05 -0800
committerJunio C Hamano <gitster@pobox.com>2010-11-24 15:55:05 -0800
commit786f174dab50ea5333fadd1650aa709927a3099f (patch)
tree6a4a40b08368f017026473c620e028dfb7697f23 /builtin/read-tree.c
parentb3ff808b714fd8fc5e4d2770720398e5dc7d27f9 (diff)
parent4eec6f988dc1638ff5b5ee3131f7452d29042a61 (diff)
downloadgit-786f174dab50ea5333fadd1650aa709927a3099f.tar.gz
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 'builtin/read-tree.c')
0 files changed, 0 insertions, 0 deletions