Show all
Author Commit Message Labels Comments Date
Junio C Hamano
GIT v1.5.1.4 Signed-off-by: Junio C Hamano <>
Quy Tonthat
Add howto files to rpm packages. RPM packages did not include howto files which causes broken links in howto-index.html Signed-off-by: Quy Tonthat <> Signed-off-by: Junio C Hamano <>
Amos Waterland
wcwidth redeclaration Build fails for git on AIX, with the message: utf8.c:66: error: conflicting types for 'wcwidth' /.../lib/gcc/powerpc-ibm-aix5.3.0.0/4.0.3/include/string.h:266: error: previous declaration of 'wcwidth' was here Fix this by renaming our static variant to our own name. Signed-off-by: Amos Waterland <> Signed-off-by: Junio C Hamano <>
J. Bruce Fields
user-manual: fix clone and fetch typos More typo fixes from Santi Béjar, plus a couple other mistakes I noticed along the way. Cc: Santi Béjar <> Signed-off-by: "J. Bruce Fields" <> Signed-off-by: Junio C Hamano <>
Junio C Hamano
Merge branch 'maint' of git:// into maint * 'maint' of git:// git-gui: Allow spaces in path to 'wish'
Junio C Hamano
Merge git:// into maint * git:// gitk: Allow user to choose whether to see the diff, old file, or new file
Jeff King
Documentation: don't reference non-existent 'git-cvsapplycommit' Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
J. Bruce Fields
user-manual: stop deprecating the manual It's just as much a work-in-progress, but at least now it's gotten enough technical review to shake out most of the really bad lies, so hopefully it doesn't do any actual damage. And if we encourage people to read it, they'll be more likely to whine about it, which will help get it fixed faster. Signed-off-by: "J. Bruce Fields" <>
J. Bruce Fields
user-manual: miscellaneous editing I cherry-picked some additional miscellaneous fixes from those suggested by Santi Béjar, including fixes to: - correct discussion of repository/HEAD->repository shortcut - add mention of git-mergetool - add mention of --track - mention "-f" as well as "+" for fetch Cc: Santi Béjar <> Signed-off-by: "J. Bruce Fields" <>
J. Bruce Fields
user-manual: fix .gitconfig editing examples Santi Béjar points out that when telling people how to "introduce themselves" to git we're advising them to replace their entire .gitconfig file. Fix that. Cc: "Santi Béjar <> Signed-off-by: "J. Bruce Fields" <>
J. Bruce Fields
user-manual: clean up fast-forward and dangling-objects sections The previous commit calls attention to the fact that we have two sections each devoted to fast-forwards and to dangling objects. Revise and attempt to differentiate them a bit. Some more reorganization may be required later.... Signed-off-by: J. Bruce Fields
J. Bruce Fields
user-manual: add section ID's Any section lacking an id gets an annoying warning when you build the manual. More seriously, the table of contents then generates volatile id's which change with every build, with the effect that we get URL's that change all the time. The ID's are manually generated and sometimes inconsistent, but that's OK. XXX: what to do about the preface? Signed-off-by: "J. Bruce Fields" <bfields@citi.umi…
J. Bruce Fields
user-manual: more discussion of detached heads, fix typos Nicolas Pitre pointed out a couple typos and some room for improvement in the discussion of detached heads. Signed-off-by: "J. Bruce Fields" <> Cc: Nicolas Pitre <>
Alex Riesen
Small correction in reading of commit headers Check if a line of the header has enough characters to possibly contain the requested prefix. Signed-off-by: Alex Riesen <> Signed-off-by: Junio C Hamano <>
James Bowes
Documentation: fix typo in git-remote.txt Signed-off-by: James Bowes <> Signed-off-by: Junio C Hamano <>
Junio C Hamano
Add test for blame corner cases. Signed-off-by: Junio C Hamano <>
Junio C Hamano
blame: -C -C -C When you do this, existing "blame -C -C" would not find that the latter half of the file2 came from the existing file1: ... both file1 and file2 are tracked ... $ cat file1 >>file2 $ git add file1 file2 $ git commit This is because we avoid the expensive find-copies-harder code that makes unchanged file (in this case, file1) as a candidate for copy & paste source when annotating an existing …
Junio C Hamano
blame: Notice a wholesale incorporation of an existing file. The -C option to blame tries to find a section of a preimage file by running diff against the lines whose origin is still unknown, and excluding the different parts. The code however did not cover the case where the tail part of the section matched, which we handle for the normal non-move/copy codepath. This breakage was most visible when preimage file matches in its entirety and failed to pass …
Linus Torvalds
Fix --boundary output "git log --boundary" incorrectly honoured the option only when "left-right" was enabled. Signed-off-by: Linus Torvalds <> Signed-off-by: Junio C Hamano <>
Jakub Narębski
diff format documentation: describe raw combined diff format Add description of raw combined diff format to diff-formats.txt, as "diff format for merges" section, before "Generating patches..." section. Signed-off-by: Jakub Narebski <> Signed-off-by: Junio C Hamano <>
Carl Worth
Mention version 1.5.1 in tutorial and user-manual Most other documentation will frequently be read from an installation of git so will naturally be associated with the installed version. But these two documents in particular are often read from web pages while users are still exploring git. It's important to mention version 1.5.1 since these documents provide example commands that won't work with previous versions of git. Signed-off-by: Junio C …
Karl Hasselström
Add --no-rebase option to git-svn dcommit git-svn dcommit exports commits to Subversion, then imports them back to git again, and last but not least rebases or resets HEAD to the last of the new commits. I guess this rebasing is convenient when using just git, but when the commits to be exported are managed by StGIT, it's really annoying. So add an option to disable this behavior. And document it, too! Signed-off-by: Karl Hasselström <kh…
Karl Hasselström
Fix markup in git-svn man page Some of the existing markup was just plain broken, and some subcommand options weren't indented properly. Signed-off-by: Karl Hasselström <> Signed-off-by: Junio C Hamano <>
Ismail Dönmez
gitweb: use decode_utf8 directly Using decode() tries to decode data that is already UTF-8 and borks, but decode_utf8 from has a built-in safety against that. Signed-off-by: Junio C Hamano <>
posix compatibility for t4200 Fix t4200 so that it also works on OS X by not relying on gnu extensions to sed. Signed-off-by: Bryan Larsen <> Signed-off-by: Junio C Hamano <>
Arjen Laarhoven
Document 'opendiff' value in config.txt and git-mergetool.txt Signed-off-by: Arjen Laarhoven <> Signed-off-by: Junio C Hamano <>
Allow PERL_PATH="/usr/bin/env perl" There is a mechanism PERL_PATH in the Makefile to specify path to Perl binary, but sometimes it is convenient to let 'env' figure out where Perl comes from, with PERL_PATH="/usr/bin/env perl". Allowing this would make things easier to MacPorts, where we wish to work with the MacPorts perl if it is installed, but fall back to the system perl if it isn't. Signed-off-by: Bryan Larsen <bryan@larsen.…
Daniel Barkalow
Make xstrndup common This also improves the implementation to match how strndup is specified (by GNU): if the length given is longer than the string, only the string's length is allocated and copied, but the string need not be null-terminated if it is at least as long as the given length. Signed-off-by: Daniel Barkalow <> Signed-off-by: Junio C Hamano <>
Junio C Hamano
diff.c: fix "size cache" handling. We broke the size-cache handling when we changed the function signature of sha1_object_info() in 21666f1a. We obviously wanted to cache the size we obtained when sha1_object_info() succeeded, not when it failed. Signed-off-by: Junio C Hamano <>
Alexandre Julliard
http-fetch: Disable use of curl multi support for libcurl < 7.16. curl_multi_remove_handle() is broken in libcurl < 7.16, in that it doesn't correctly update the active handles count when a request is aborted. This causes the transfer to hang forever waiting for the handle count to become less than the number of active requests. Signed-off-by: Alexandre Julliard <> Signed-off-by: Junio C Hamano <>
  1. Prev
  2. Next