Commits

Author Commit Message Labels Comments Date
Junio C Hamano
tests: make scripts executable just for consistency. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Remove "octopus". We still advertise "git resolve" as a standalone command, but never "git octopus", so nobody should be using it and it is safe to retire it. The functionality is still available as a strategy backend. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Remove unused cmd-rename.sh This file is a remnant from the big command rename which happened quite some time ago. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Remove generated files */*.py[co] We missed ones in the compat/ subdirectory. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Documentation: stdout of update-hook is connected to /dev/null Mention that update-hook does not emit its stdout to the sender. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
rev-list --objects: fix object list without commit. Earlier, "rev-list --objects <sha1>" for an object chain that does not have any commit failed with a usage message. This fixes "send-pack remote $tag" where tag points at a non-commit (e.g. a blob). Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong
Documentation/git-archimport: document -o, -a, f, -D options Also, ensure usage help switches are in the same order. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
howto/using-topic-branches: Recommend public URL git://git.kernel.org/ 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>
Linus Torvalds
Make "git help" sort git commands in columns This changes "pretty_print_string_list()" to show the git commands alphabetically in column order, which is the normal one. Ie instead of doing git commands available in '/home/torvalds/bin' ---------------------------------------------- add am ... applypatch archimport ... cat-file check-ref-format ... ... it does git com…
Linus Torvalds
Make "git help" react to window size correctly Currently the git "show commands" function will react to the environment variable COLUMNS, or just default to a width of 80 characters. That's just soo eighties. Nobody sane sets COLUMNS any more, unless they need to support some stone-age software from before the age of steam engines, SIGWINCH and TIOCGWINSZ. So get with the new century, and use TIOCGWINSZ to get the terminal size. Signed-off-…
Junio C Hamano
Documentation: typos and small fixes in "everyday". Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
clone-pack: remove unused and undocumented --keep flag While we are at it, give fully spelled --keep to fetch-pack. Also give --quiet in addition to -q to fetch-pack as well. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
fetch-pack: -k option to keep downloaded pack. Split out the functions that deal with the socketpair after finishing git protocol handshake to receive the packed data into a separate file, and use it in fetch-pack to keep/explode the received pack data. We earlier had something like that on clone-pack side once, but the list discussion resulted in the decision that it makes sense to always keep the pack for clone-pack, so unpacking option is …
Junio C Hamano
Revert "get_sha1_basic(): corner case ambiguity fix" This reverts 6677c4665af2d73f670bec382bc82d0f2e9513fb commit. The misguided disambiguation has been reverted, so there is no point testing that misfeature.
Junio C Hamano
Revert "We do not like "HEAD" as a new branch name" This reverts ee34518d629331dadd58b1a75294369d679eda8b commit.
Junio C Hamano
Revert "refs.c: off-by-one fix." This reverts 06bf6ac4248e834a229027908d405f5e42ac96d7 commit.
Junio C Hamano
Remove misguided branch disambiguation. This removes the misguided attempt to refuse processing a branch name xyzzy and insist it to be given as either heads/xyzzy or tags/xyzzy when a tag xyzzy exists. There was no reason to do so --- the search order was predictable and well defined, so if the user says xyzzy we should have taken the tag xyzzy in such a case without complaining. This incidentally fixes another subtle bug related to …
Junio C Hamano
Documentation: HTTP needs update-server-info. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Comment fixes. Signed-off-by: Junio C Hamano <junkio@cox.net>
Jan Harkes
Fix git-am --skip git-am --skip does not unpack the next patch and ends up reapplying the old patch, believing that it is the new patch in the sequence. If the old patch applied successfully it will commit it with the supposedly skipped log message and ends up dropping the following patch. If the patch did not apply the user is left with the conflict he tried to skip and has to unpack the next patch in the sequenc…
Junio C Hamano
Forbid pattern maching characters in refnames. by marking '?', '*', and '[' as bad_ref_char(). Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Examples of resetting. Morten Welinder says examples of resetting is really about recovering from botched commit/pulls. I agree that pointers from commands that cause a reset to be needed in the first place would be very helpful. Also reset examples did not mention "pull/merge" cases. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
refs.c: off-by-one fix. Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin
We do not like "HEAD" as a new branch name This makes git-check-ref-format fail for "HEAD". Since the check is only executed when creating refs, the existing symbolic ref is safe. Otherwise these commands, most likely are pilot errors, would do pretty funky stuff: git checkout -b HEAD git pull . other:HEAD Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Sort globbed refname in show-branch. "git show-branch bugs/*" shows all branches whose name match the specified pattern, but in the order readdir() happened to returned. Sort them to make the output more predictable. Signed-off-by: Junio C Hamano <junkio@cox.net>
Nicolas Pitre
small cleanup for diff-delta.c This patch removes unused remnants of the original xdiff source. No functional change. Possible tiny speed improvement. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Fredrik Kuivinen
git-whatchanged: Add usage string Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Fredrik Kuivinen
git-log: Add usage string Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Fredrik Kuivinen
git-diff: Usage string clean-up Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
applymbox: typofix Sorry, I broke this command completely with the stupid typo. Noticed by Marco Costalba. Signed-off-by: Junio C Hamano <junkio@cox.net>
  1. Prev
  2. Next