![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 24 Nov 2010 23:55:05 +0000 (15:55 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 24 Nov 2010 23:55:05 +0000 (15:55 -0800) | ||
| commit | 786f174dab50ea5333fadd1650aa709927a3099f | |
| tree | 6a4a40b08368f017026473c620e028dfb7697f23 | tree | snapshot |
| parent | b3ff808b714fd8fc5e4d2770720398e5dc7d27f9 | commit | diff |
| parent | 4eec6f988dc1638ff5b5ee3131f7452d29042a61 | commit | diff |
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
* 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
| Documentation/fetch-options.txt | diff1 | | diff2 | | blob | history |
| Documentation/git-pull.txt | diff1 | | diff2 | | blob | history |
| Documentation/rev-list-options.txt | diff1 | | diff2 | | blob | history |