Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
GIT 1.6.5-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.6.5-rc0
Junio C Hamano
Merge branch 'maint' * maint: git-pull: do not mention --quiet and --verbose twice githooks.txt: put hooks into subsections
Emmanuel Trillaud
git-pull: do not mention --quiet and --verbose twice git-pull.txt includes fetch-options.txt and merge-options.txt, both of which document the --quiet and --verbose. Supress the ones from fetch-options.txt. Signed-off-by: Emmanuel Trillaud <etrillaud@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Bert Wesarg
githooks.txt: put hooks into subsections All hooks are currently in its own section. Which may confuse users, because the section name serves as the hook file name and sections are all caps for man pages. Putting them into a new HOOKS section and each hook into a subsection keeps the case to lower case. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jc/mailinfo-scissors' * jc/mailinfo-scissors: mailinfo.scissors: new configuration am/mailinfo: Disable scissors processing by default Documentation: describe the scissors mark support of "git am" Teach mailinfo to ignore everything before -- >8 -- mark builtin-mailinfo.c: fix confusing internal API to mailinfo()
Junio C Hamano
Merge branch 'jk/clone-b' * jk/clone-b: clone: add --branch option to select a different HEAD
Junio C Hamano
Merge branch 'jc/upload-pack-hook' * jc/upload-pack-hook: upload-pack: feed "kind [clone|fetch]" to post-upload-pack hook upload-pack: add a trigger for post-upload-pack hook
Junio C Hamano
Merge branch 'tr/reset-checkout-patch' * tr/reset-checkout-patch: stash: simplify defaulting to "save" and reject unknown options Make test case number unique tests: disable interactive hunk selection tests if perl is not available DWIM 'git stash save -p' for 'git stash -p' Implement 'git stash save --patch' Implement 'git checkout --patch' Implement 'git reset --patch' builtin-add: refactor the meat of interactive_add…
Junio C Hamano
Merge branch 'np/maint-1.6.3-deepen' * np/maint-1.6.3-deepen: pack-objects: free preferred base memory after usage make shallow repository deepening more network efficient
Junio C Hamano
Merge branch 'maint' * maint: push: re-flow non-fast-forward message push: fix english in non-fast-forward message
Jeff King
push: re-flow non-fast-forward message The extreme raggedness of the right edge make this jarring to read. Let's re-flow the text to fill the lines in a more even way. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King
push: fix english in non-fast-forward message We must use an article when referring to the section because it is a non-proper noun, and it must be the definite article because we are referring to a specific section. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Pascal Obry
Do not scramble password read from .cvspass Passwords stored in .cvspass are already scrambled, we do not want to scramble them twice. Only passwords read from the command line are scrambled. This fixes a regression introduced by b2139db (git-cvsimport: add support for cvs pserver password scrambling., 2009-08-14). Signed-off-by: Pascal Obry <pascal@obry.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nicolas Pitre
pack-objects: free preferred base memory after usage When adding objects for preferred delta base, the content from tree objects leading to given paths is kept in a cache. This has the potential to grow significantly, especially with large directories as the whole tree object content is loaded in memory, even if in practice the number of those objects is limited to the 256 cache entries plus the $window root tree objects. Still, that can't hurt fre…
Nicolas Pitre
make shallow repository deepening more network efficient First of all, I can't find any reason why thin pack generation is explicitly disabled when dealing with a shallow repository. The possible delta base objects are collected from the edge commits which are always obtained through history walking with the same shallow refs as the client, Therefore the client is always going to have those base objects available. So let's remove that restriction. The…
Junio C Hamano
Merge branch 'maint' * maint: git-clone: add missing comma in --reference documentation
Junio C Hamano
Merge branch 'maint-1.6.3' into maint * maint-1.6.3: git-clone: add missing comma in --reference documentation git-cvsserver: no longer use deprecated 'git-subcommand' commands clone: disconnect transport after fetching
Junio C Hamano
Merge branch 'maint-1.6.2' into maint-1.6.3 * maint-1.6.2: git-clone: add missing comma in --reference documentation clone: disconnect transport after fetching
Miklos Vajna
git-clone: add missing comma in --reference documentation Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint' * maint: git-cvsserver: no longer use deprecated 'git-subcommand' commands clone: disconnect transport after fetching
Junio C Hamano
Merge branch 'maint-1.6.3' into maint * maint-1.6.3: git-cvsserver: no longer use deprecated 'git-subcommand' commands clone: disconnect transport after fetching
Jeff King
push: teach --quiet to suppress "Everything up-to-date" This should have been part of 481c7a6, whose goal was to make "git push -q" silent unless there is an error. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint-1.6.2' into maint-1.6.3 * maint-1.6.2: clone: disconnect transport after fetching
Gerrit Pape
git-cvsserver: no longer use deprecated 'git-subcommand' commands git-cvsserver still references git commands like 'git-config', which is depcrecated. This commit changes git-cvsserver to use the 'git subcommand' form. Sylvain Beucler reported the problem through http://bugs.debian.org/536067 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King
clone: disconnect transport after fetching The current code just leaves the transport in whatever state it was in after performing the fetch. For a non-empty clone over the git protocol, the transport code already disconnects at the end of the fetch. But for an empty clone, we leave the connection hanging, and eventually close the socket when clone exits. This causes the remote upload-pack to complain "the remote end hung up unexpectedly…
Johannes Sixt
status: list unmerged files much later When resolving a conflicted merge, two lists in the status output need more attention from the user than other parts. - the list of updated paths is useful to review the amount of changes the merge brings in (the user cannot do much about them other than reviewing, though); and - the list of unmerged paths needs the most attention from the user; the user needs to resolve them in order…
Matthieu Moy
stash: simplify defaulting to "save" and reject unknown options With the earlier DWIM patches, certain combination of options defaulted to the "save" command correctly while certain equally valid combination did not. For example, "git stash -k" were Ok but "git stash -q -k" did not work. This makes the logic of defaulting to "save" much simpler. If there are no non-flag arguments, it is clear that there is no command word, and we default to "save" subcommand…
Junio C Hamano
builtin-apply.c: get rid of an unnecessary use of temporary array Instead of allocating a temporary array imglen[], copying contents to it from another array img->line[], and then using imglen[], use the value from img->line[], whose value does not change during the whole process. This incidentally removes a use of C99 variable length array, which some older compilers apparently are not happy with. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
builtin-pack-objects.c: avoid vla This is one of only two places that we use C99 variable length array on the stack, which some older compilers apparently are not happy with. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brian Gianforcaro
Style fixes, add a space after if/for/while. The majority of code in core git appears to use a single space after if/for/while. This is an attempt to bring more code to this standard. These are entirely cosmetic changes. Signed-off-by: Brian Gianforcaro <b.gianfo@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
  1. Prev
  2. Next