diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-12-02 09:59:35 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-02 10:01:59 -0800 |
| commit | 76bf488e61b8a87191a1779b79820545e64ef275 (patch) | |
| tree | 182ca04d19ef735865aab0f9c075020c0b4a7b1d /Documentation/git-upload-archive.txt | |
| parent | help: Do not unnecessarily look for a repository (diff) | |
| download | tgif-76bf488e61b8a87191a1779b79820545e64ef275.tar.xz | |
Do not misidentify "git merge foo HEAD" as an old-style invocation
This was misinterpreted as an ancient style "git merge <message> HEAD
<commit> <commit>..." that merges one (or more) <commit> into the current
branch and record the resulting commit with the given message. Then a
later sanity check found that there is no <commit> specified and gave
a usage message.
Tested-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-upload-archive.txt')
0 files changed, 0 insertions, 0 deletions