diff options
| author |  J. Bruce Fields <bfields@citi.umich.edu> | 2007-03-10 21:52:39 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2007-03-10 23:05:01 -0500 |
| commit | fabbd8f6ca610a570d7bfcbbfc80bb0e03247b2a (patch) | |
| tree | a7f3a909000f264a885ae60215b17332f372f258 /merge-base.c | |
| parent | user-manual: fix inconsistent example (diff) | |
| download | tgif-fabbd8f6ca610a570d7bfcbbfc80bb0e03247b2a.tar.xz | |
user-manual: fix inconsistent use of pull and merge
I used "git pull ." instead of "git merge" here without any explanation.
Stick instead to "git merge" for now (the equivalent pull syntax is
still covered in a later chapter).
Cc: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Diffstat (limited to 'merge-base.c')
0 files changed, 0 insertions, 0 deletions