summaryrefslogtreecommitdiff
path: root/Documentation/howto/using-topic-branches.txt
AgeCommit message (Collapse)Author
2006-01-20update using-topic-branchesLuck, Tony
Update documentation to warn users not to create noise in then Linux history by creating pointless "Auto-update from upstream" merge commits. Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-19howto/using-topic-branches: Recommend public URL git://git.kernel.org/Junio C Hamano
Recommending this means subsystem maintainers do not have to log-in just to resync with upstream. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-14Documentation: topic branchesJunio C Hamano
Recommend git over ssh direct to master.kernel.org, instead of going over rsync to public machines, since this is meant to be a procedure for kernel subsystem maintainers. Also fix an obvious typo. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-09Update howto using-topic-branchesLuck, Tony
"git resolve" is being deprecated in favour of "git merge". Update the documentation to reflect this. Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-07Documentation update: use git branch -d foo where applicableKai Ruemmler
This updates documentation to use git branch -d foo in favour of rm .git/refs/heads/foo Signed-off-by: Kai Ruemmler <kai.ruemmler@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-22Retire rev-tree.Junio C Hamano
Some old scripts might still use git-rev-tree, but it really is clearly inferior in every way to git-rev-list that such scripts should be fixed anyway. Fixing them should be pretty easy. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-26Add Abstract: support for howto index generator.Junio C Hamano
Maybe it's time for me to really learn asciidoc. Also I should do Perl ;-). Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-26[PATCH] update howto/using-topic-branches.txttony.luck@intel.com
Various updates and cleanups for my howto on using branches in GIT as a Linux subsystem maintainer. Three categories of changes: 1) Updates for new features in GIT 0.99.5 2) Changes to use "git fetch" rather than "git pull" to update local linus branch. 3) Cleanups suggested by Len Brown Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-18[PATCH] updates for Documentation/howto/using-topic-branches.txtLuck, Tony
Small fix (use "git branch" to make branches, rather than "git checkout -b"). Optimization for trivial patches (apply to release and merge to test). Three sample scripts appended. Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-15Keep excellent tutorial for using topic branches by Tony LuckJunio C Hamano
I would eventually like to move this to become a part of the tutorial, but anyway, this was an excellent post that describes how topic branches can be used to keep track of local changes.