path: root/Documentation/everyday.txt
diff options
authorNicolas Pitre <>2007-01-15 03:44:18 (GMT)
committerJunio C Hamano <>2007-01-15 05:12:14 (GMT)
commitc14261eaa297504799e3b21ecbd751edbae912c0 (patch)
tree26729b99c1fdc3549bdc12aef9c3e8d55eb59983 /Documentation/everyday.txt
parentadb7ba6b116c0ec26e058b9b41a5a528d123323f (diff)
some doc updates
1) talk about "git merge" instead of "git pull ." 2) suggest "git repo-config" instead of directly editing config files 3) echo "URL: blah" > .git/remotes/foo is obsolete and should be "git repo-config blah" 4) support for partial URL prefix has been removed (see commit ea560e6d64374ec1f6c163c276319a3da21a1345) so drop mention of it. Signed-off-by: Nicolas Pitre <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation/everyday.txt')
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/everyday.txt b/Documentation/everyday.txt
index 4e83994..ca36a76 100644
--- a/Documentation/everyday.txt
+++ b/Documentation/everyday.txt
@@ -148,8 +148,7 @@ modification will be caught if you do `git commit -a` later.
<8> redo the commit undone in the previous step, using the message
you originally wrote.
<9> switch to the master branch.
-<10> merge a topic branch into your master branch. You can also use
-`git pull . alsa-audio`, i.e. pull from the local repository.
+<10> merge a topic branch into your master branch.
<11> review commit logs; other forms to limit output can be
combined and include `\--max-count=10` (show 10 commits),
`\--until=2005-12-10`, etc.