Show all
Author Commit Message Date
Linus Torvalds
Ignore leading empty lines while summarizing merges "git log" and friends normally skip the initial empty lines when showing one-line summary of a commit, but merge summary didn't. Signed-off-by: Linus Torvalds <> ---- builtin-fmt-merge-msg.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) Signed-off-by: Junio C Hamano <>
Christian Couder
bisect: squelch "fatal: ref HEAD not a symref" misleading message To get the current HEAD when we start bisecting using for example "git bisect start", we first try "git symbolic-ref HEAD" to get a nice name, and if it fails, we fall back to "git rev-parse --verify HEAD". The problem is that when "git symbolic-ref HEAD" fails, it displays "fatal: ref HEAD not a symref", so it looks like "git bisect start" failed and does not accept detached HEAD, even if in fac…
Alberto Bertogli
builtin-apply: Show a more descriptive error on failure when opening a patch When a patch can't be opened (it doesn't exist, there are permission problems, etc.) we get the usage text, which is not a proper indication of failure. Signed-off-by: Alberto Bertogli <> Signed-off-by: Junio C Hamano <>
Scott Collins
Clarify documentation of git-cvsserver, particularly in relation to git-shell For SSH clients restricted to git-shell, CVS_SERVER does not have to be specified, because git-shell understands the default value of 'cvs' to mean git-cvsserver'. This makes it totally transparent to CVS users, but the instruction to set up CVS access for people with real shell access does not apply. Previous wording mentioning GIT_AUTHOR, GIT_COMMITTER variables was unclear that we really meant…
Clifford Caoile
Docs gitk: Explicitly mention the files that gitk uses (~/.gitk) gitk creates and uses ~/.gitk Signed-off-by: Clifford Caoile <> Signed-off-by: Junio C Hamano <>
Junio C Hamano
Document -w option to shortlog Noticed by Fredrik Noring. Signed-off-by: Junio C Hamano <>
Christian Couder
bisect: report bad rev better The previous one overwrote the variable used to report the bad input when the input is actually bad, and we did not give a useful enough information. This corrects it. Signed-off-by: Christian Couder <> Signed-off-by: Junio C Hamano <>
Christian Couder
bisect: fix bad rev checking in "git bisect good" It seems that "git bisect good" and "git bisect skip" have never properly checked arguments that have been passed to them. As soon as one of them can be parsed as a SHA1, no error or warning would be given. This is because 'git rev-parse --revs-only --no-flags "$@"' always "exit 0" and outputs all the SHA1 it can found from parsing "$@". This patch fix this by using, for each "bisect good" argum…
Michele Ballabio
revision.c: make --date-order overriddable Jan Engelhardt noticed that while --topo-order can be overridden by a subsequent --date-order, the reverse was not possible. That's because setup_revisions() failed to set revs->lifo properly. Signed-off-by: Michele Ballabio <> Signed-off-by: Junio C Hamano <>
Björn Steinbrink
Fix section about backdating tags in the git-tag docs The tagger is equal to the committer, not the author, so GIT_COMMITTER_DATE is the right environment variable to use, not GIT_AUTHOR_DATE. Signed-off-by: Björn Steinbrink <> Signed-off-by: Junio C Hamano <>
Johannes Sixt
Document option --only of git commit Its documentation was removed by 6c96753 (Documentation/git-commit: rewrite to make it more end-user friendly, 2006-12-08), even though it is referenced from a few places, including builtin-commit.c (as part of the commentary in the commit message template). Signed-off-by: Johannes Sixt <> Signed-off-by: Junio C Hamano <>
Dirk Suesserott
Documentation/git-request-pull: Fixed a typo ("send" -> "end") Signed-off-by: Dirk Suesserott <> Signed-off-by: Junio C Hamano <>
Carlos Rica
core-tutorial.txt: Fix showing the current behaviour. The --root option from "git diff-tree" won't do nothing when is given to commands like git-whatchanged or git-log, because those always print the initial commit by default. This fixes the tutorial explaining the function of the log.showroot configuration variable. Signed-off-by: Carlos Rica <> Signed-off-by: Junio C Hamano <>
René Scharfe
git-archive: ignore prefix when checking file attribute Ulrik Sverdrup noticed that git-archive doesn't correctly apply the attribute export-subst when the option --prefix is given, too. When it checked if a file has the attribute turned on, git-archive would try to look up the full path -- including the prefix -- in .gitattributes. That's wrong, as the prefix doesn't need to have any relation to any existing directories, tracked or not. This patch …
Carlos Rica
Fix documentation syntax of optional arguments in short options. When an argument for an option is optional, like in -n from git-tag, puting a space between the option and the argument is interpreted as a missing argument for the option plus an isolated argument. Documentation now reflects the need to write the parameter following the option -n, as in "git tag -nARG", for instance. Signed-off-by: Carlos Rica <> Signed-off-by: Junio C Hamano …
Junio C Hamano
Fix "git apply" to correctly enforce "match at the beginning" An earlier commit 4be6096 (apply --unidiff-zero: loosen sanity checks for --unidiff=0 patches, 2006-09-17) made match_beginning and match_end computed incorrectly. If a hunk inserts at the beginning, old position recorded at the hunk is line 0, and if a hunk changes at the beginning, it is line 1. The new test added to t4104 exposes that the old code did not insist on matching at the beginning f…
Junio C Hamano
GIT Signed-off-by: Junio C Hamano <>
Junio C Hamano
Update draft release notes for Signed-off-by: Junio C Hamano <>
Junio C Hamano
Merge branch 'jc/maint-fetch-regression-1.5.4' into maint * jc/maint-fetch-regression-1.5.4: git-fetch test: test tracking fetch results, not just FETCH_HEAD Fix branches file configuration Tighten refspec processing
Jeff King
Documentation: clarify use of .git{ignore,attributes} versus .git/info/* gitignore patterns can be read from three different files, while gitattributes can come from two files. Let's provide some hints to the user about the differences and how they are typically used. Suggested by Toby Corkindale, but gratuitously reworded by Jeff King. Signed-off-by: Toby Corkindale <> Signed-off-by: Jeff King <> Signed-off-by: Junio C Haman…
Brandon Casey
t/ use test_must_fail rather than '!' Signed-off-by: Junio C Hamano <>
Junio C Hamano
git-fetch test: test tracking fetch results, not just FETCH_HEAD We really should have done this long time ago. Existing t5515 test was written for the specific purpose of catching regression to the contents of generated FETCH_HEAD file, but it also is a good place to make sure various fetch configurations do fetch what they intend to fetch (and nothing else). Signed-off-by: Junio C Hamano <>
Daniel Barkalow
Fix branches file configuration Fetched remote branch from .git/branches/foo should fetch into refs/heads/foo. Also when partial URL is given, the fetched head should always be remote HEAD, and the result should not be stored anywhere. Signed-off-by: Daniel Barkalow <> Signed-off-by: Junio C Hamano <>
Daniel Barkalow
Tighten refspec processing This changes the pattern matching code to not store the required final / before the *, and then to require each side to be a valid ref (or empty). In particular, any refspec that looks like it should be a pattern but doesn't quite meet the requirements will be found to be invalid as a fallback non-pattern. This was cherry picked from commit ef00d15 (Tighten refspec processing, 2008-03-17), and tw…
Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation. Texts between ~ and ~ will be subscripted during the asciidoc translation. Signed-off-by: Guanqun Lu <> Signed-off-by: Junio C Hamano <> (cherry picked from commit 0c829391cfcdc57172765322575804a7ad5f3116)
Junio C Hamano
Start draft ReleaseNotes for Signed-off-by: Junio C Hamano <>
Junio C Hamano
rebase -m: do not trigger pre-commit verification When rebasing changes that contain issues that the pre-commit hook flags as problematic, the rebase cannot be continued. However, rebase is about transplanting commits that are already made with as little distortion as possible, and pre-commit check should not interfere. Earlier, c5b09fe (Avoid update hook during git-rebase --interactive, 2007-12-19) fixed "rebase -i", but "rebase -m" shared the…
Junio C Hamano
format-patch: generate MIME header as needed even when there is format.header Earlier, the callchain from pretty_print_commit() down to pp_title_line() had an unwarranted assumption that the presense of "after_subject" parameter, means the caller has already output MIME headers for attachments. The parameter's primary purpose is to give extra header lines the caller wants to place after pp_title_line() generates the "Subject: " line. This assumption does not hold when the…
Jonas Fonseca
Make man page building quiet when DOCBOOK_XSL_172 is defined Tell xmlto to repress printing of the lines: Note: meta date : No date. Using generated date git-xyx Note: Writing git-xyz.1 Signed-off-by: Jonas Fonseca <> Signed-off-by: Junio C Hamano <>
Bernt Hansen
git-new-workdir: Share SVN meta data between work dirs and the repository Multiple work dirs with git svn caused each work dir to have its own stale copy of the SVN meta data in .git/svn git svn rebase updates commits with git-svn-id: in the repository and stores the SVN meta data information only in that work dir. Attempting to git svn rebase in other work dirs for the same branch would fail because the last revision fetched according to the git-svn-id is greater tha…
  1. Prev
  2. Next