summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-06-14Update draft release notes to 1.7.2Libravatar Junio C Hamano1-11/+102
It is loooong overdue. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-06-14Merge git://git.bogomips.org/git-svnLibravatar Junio C Hamano1-0/+4
* git://git.bogomips.org/git-svn: git svn: avoid unnecessary '/' in paths for SVN git-svn: strip off leading slashes on --trunk argument
2010-06-14git svn: avoid unnecessary '/' in paths for SVNLibravatar Eric Wong1-0/+3
svn:// servers are more picky regarding redundant slashes than file:// and http(s)://-backed respositories. Since the last commit, we avoid putting unnecessary slashes in $GIT_CONFIG, but this doesn't help users who are already set up that way. Signed-off-by: Eric Wong <normalperson@yhbt.net>
2010-06-14git-svn: strip off leading slashes on --trunk argumentLibravatar Jonathan Nieder1-0/+1
The following command git svn clone \ -r9500:10006 \ svn://svn.debian.org/svn/pkg-games/packages \ --trunk=/trunk/freedoom \ --branches=/branches/freedoom \ --tags=/tags/freedoom \ freedoom.git.2009091 produces strange results: With v1.6.3.3 (and perhaps earlier versions), this would fetch up to and including r9978 (the last revision of the no_iwad_alternatives branch before it was deleted), check it out, and prematurely declare success, leaving out some commits to the trunk (r9984, r9985, r10006) from after the branch was merged. With v1.6.5-rc0~74 (svn: allow branches outside of refs/remotes, 2009-08-11) and later, this fetches up to and including r9978 and then attempts a post-fetch checkout and fails. r9978 = 25f0920175c395f0f22f54ae7a2318147f745274 (refs/remotes/no_iwad_alternatives) fatal: refs/remotes/trunk: not a valid SHA1 update-ref refs/heads/master refs/remotes/trunk: command returned error: 128 Checking .git/config reveals fetch = packages//trunk/freedoom:refs/remotes/trunk And with both 1.6.3.3 and 1.7.1, using --trunk=trunk/freedom without the leading slash (/) works fine. Moral: git-svn needs to scrub an initial / from $_trunk and related arguments it receives. Make it so. Reported-by: Jon Dowland <jmtd@debian.org> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net>
2010-06-13Merge branch 'maint'Libravatar Junio C Hamano1-4/+4
* maint: git-mailinfo documentation: clarify -u/--encoding
2010-06-13git-mailinfo documentation: clarify -u/--encodingLibravatar Zhang Le1-4/+4
Instead of talking about hardcoded UTF-8, describe i18n.commitencoding and the --encoding option, and state that they default to UTF-8. Signed-off-by: Zhang Le <r0bertz@gentoo.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-06-13Merge branch 'ab/cvsserver'Libravatar Junio C Hamano3-12/+135
* ab/cvsserver: git-cvsserver: test for pserver authentication support git-cvsserver: document making a password without htpasswd git-cvsserver: Improved error handling for pserver git-cvsserver: indent & clean up authdb code git-cvsserver: use a password file cvsserver pserver git-cvsserver: authentication support for pserver
2010-06-13Merge branch 'mg/notes-dry-run'Libravatar Junio C Hamano5-10/+72
* mg/notes-dry-run: notes: dry-run and verbose options for prune
2010-06-13Merge branch 'mc/maint-zoneparse'Libravatar Junio C Hamano1-1/+2
* mc/maint-zoneparse: Add "Z" as an alias for the timezone "UTC"
2010-06-13Merge branch 'jk/diff-m-doc'Libravatar Junio C Hamano1-0/+7
* jk/diff-m-doc: docs: clarify meaning of -M for git-log
2010-06-13Merge branch 'jn/maint-doc-ignore'Libravatar Junio C Hamano1-5/+9
* jn/maint-doc-ignore: gitignore.5: Clarify matching rules
2010-06-13Merge branch 'jn/fsck-ident'Libravatar Junio C Hamano2-2/+8
* jn/fsck-ident: fsck: fix bogus commit header check
2010-06-13Merge branch 'bs/userdiff-php'Libravatar Junio C Hamano1-1/+3
* bs/userdiff-php: diff: Support visibility modifiers in the PHP hunk header regexp
2010-06-13Merge branch 'jk/maint-sha1-file-name-fix'Libravatar Junio C Hamano1-13/+15
* jk/maint-sha1-file-name-fix: remove over-eager caching in sha1_file_name
2010-06-13Merge branch 'jk/maint-pull-dry-run-noop'Libravatar Junio C Hamano1-1/+6
* jk/maint-pull-dry-run-noop: pull: do nothing on --dry-run
2010-06-13Merge branch 'ab/submodule-foreach-toplevel'Libravatar Junio C Hamano3-5/+13
* ab/submodule-foreach-toplevel: git-submodule foreach: Add $toplevel variable
2010-06-13Merge branch 'rs/grep-binary'Libravatar Junio C Hamano4-41/+169
* rs/grep-binary: grep: support NUL chars in search strings for -F grep: use REG_STARTEND for all matching if available grep: continue case insensitive fixed string search after NUL chars grep: use memmem() for fixed string search grep: --name-only over binary grep: --count over binary grep: grep: refactor handling of binary mode options grep: add test script for binary file handling
2010-06-13Merge branch 'jn/gitweb-syntax-highlight'Libravatar Junio C Hamano3-3/+123
* jn/gitweb-syntax-highlight: gitweb: Refactor syntax highlighting support gitweb: Syntax highlighting support
2010-06-13Merge branch 'js/maint-windows'Libravatar Junio C Hamano2-2/+1
* js/maint-windows: Recent MinGW has a C99 implementation of snprintf functions mingw: use _commit to implement fsync
2010-06-13Merge branch 'bw/diff-metainfo-color'Libravatar Junio C Hamano1-26/+35
* bw/diff-metainfo-color: diff: fix coloring of extended diff headers
2010-06-13Merge branch 'js/try-to-free-stackable'Libravatar Junio C Hamano4-5/+16
* js/try-to-free-stackable: Do not call release_pack_memory in malloc wrappers when GIT_TRACE is used Have set_try_to_free_routine return the previous routine
2010-06-13Merge branch 'jn/make-header-dependency'Libravatar Junio C Hamano1-1/+5
* jn/make-header-dependency: Makefile: let header dependency checker override COMPUTE_HEADER_DEPENDENCIES Makefile: fix header dependency checker to allow NO_CURL builds
2010-06-13Merge branch 'cb/assume-unchanged-fix'Libravatar Junio C Hamano3-3/+25
* cb/assume-unchanged-fix: Documentation: git-add does not update files marked "assume unchanged" do not overwrite files marked "assume unchanged"
2010-06-13Merge branch 'jn/notes-doc'Libravatar Junio C Hamano4-35/+238
* jn/notes-doc: Documentation/notes: nitpicks Documentation/notes: clean up description of rewriting configuration Documentation/notes: simplify treatment of default display refs Documentation/log: add a CONFIGURATION section Documentation/notes: simplify treatment of default notes ref Documentation/notes: add configuration section Documentation/notes: describe content of notes blobs Documentation/notes: document format of notes trees
2010-06-13Merge branch 'wp/pretty-enhancement'Libravatar Junio C Hamano4-24/+221
* wp/pretty-enhancement: pretty: initialize new cmt_fmt_map to 0 pretty: add aliases for pretty formats pretty: add infrastructure for commit format aliases pretty: make it easier to add new formats
2010-06-13Merge branch 'ab/test-cleanup'Libravatar Junio C Hamano5-5/+7
* ab/test-cleanup: Turn setup code in t2007-checkout-symlink.sh into a test Move t6000lib.sh to lib-*
2010-06-13Merge branch 'jn/maint-amend-missing-name'Libravatar Junio C Hamano2-7/+59
* jn/maint-amend-missing-name: commit --amend: cope with missing display name
2010-06-13Merge branch 'rs/diff-no-minimal'Libravatar Junio C Hamano7-11/+11
* rs/diff-no-minimal: git diff too slow for a file
2010-06-13Merge branch 'maint'Libravatar Junio C Hamano2-6/+6
* maint: add-interactive: Clarify “remaining hunks in the file”
2010-06-13add-interactive: Clarify “remaining hunks in the file”Libravatar Jonathan Nieder2-6/+6
The "a" and "d" commands to ‘add --patch’ (accept/reject rest of file) interact with "j", "g", and "/" (skip some hunks) in a perhaps confusing way: after accepting or rejecting all _later_ hunks in the file, they return to the earlier, skipped hunks and prompt the user about them again. This behavior can be very useful in practice. One can still accept or reject _all_ undecided hunks in a file by using the "g" command to move to hunk #1 first. Reported-by: Frédéric Brière <fbriere@fbriere.net> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-06-13gitweb: Fix typo in hash key name in %opts in git_header_htmlLibravatar Jakub Narebski1-1/+1
The name of the key has to be the same in call site handle_errors_html and in called subroutine that uses it, i.e. git_header_html. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-06-11Merge branch 'maint'Libravatar Junio C Hamano1-0/+6
* maint: t/README: document --root option Makefile: default pager on AIX to "more"
2010-06-11t/README: document --root optionLibravatar Thomas Rast1-0/+6
We've had this option since f423ef5 (tests: allow user to specify trash directory location, 2009-08-09). Make it easier to look up :-) Signed-off-by: Thomas Rast <trast@student.ethz.ch> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-06-11Makefile: default pager on AIX to "more"Libravatar Jeff King1-0/+1
AIX doesn't ship with "less" by default, and their "more" is more featureful than average, so the latter is a more sensible choice. People who really want less can set the compile-time option themselves, or users can set $PAGER. Signed-off-by: Jeff King <peff@peff.net> Tested-by: Tor Arntsen <tor@spacetec.no> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-06-11merge-recursive: demonstrate an incorrect conflict with submoduleLibravatar Johannes Sixt1-0/+29
When one side of a merge turns a directory into a submodule, and the other side does not touch that directory (but has other non-conflicting changes), then a merge should succeed. But currently, it does not; it rather fails with a file/directory conflict. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-06-10Makefile: default pager on AIX to "more"Libravatar Jeff King1-0/+1
AIX doesn't ship with "less" by default, and their "more" is more featureful than average, so the latter is a more sensible choice. People who really want less can set the compile-time option themselves, or users can set $PAGER. Signed-off-by: Jeff King <peff@peff.net> Tested-by: Tor Arntsen <tor@spacetec.no> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-06-07Merge branch 'maint'Libravatar Junio C Hamano3-4/+4
* maint: Change C99 comments to old-style C comments
2010-06-07Change C99 comments to old-style C commentsLibravatar Tor Arntsen3-4/+4
Signed-off-by: Tor Arntsen <tor@spacetec.no> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-06-07Merge branch 'maint'Libravatar Junio C Hamano1-4/+5
* maint: commit.txt: clarify how --author argument is used
2010-06-06commit.txt: clarify how --author argument is usedLibravatar Jay Soffian1-4/+5
commit --author was added by 146ea06 (git commit --author=$name: look $name up in existing commits), but its documentation was sorely lacking compared to its excellent commit message. This commit tries to improve the documentation. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-06-06Merge branch 'maint'Libravatar Junio C Hamano1-0/+6
* maint: setup: document prefix
2010-06-05setup: document prefixLibravatar Clemens Buchacher1-0/+6
Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-06-03git svn: fix empty directory creationLibravatar Michael J. Kiwala1-1/+2
Avoid attempts to stat() the contents of '', which could happen when the root directory is empty. Additionally, remove the unnecessary '_' stat optimization since it was confusing and possibly throwing off the non-existent case. [ew: fixed indentation, rewrote commit message] Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Michael J. Kiwala <mkiwala@genome.wustl.edu>
2010-06-02Merge branch 'maint'Libravatar Junio C Hamano5-5/+14
* maint: git-compat-util.h: use apparently more common __sgi macro to detect SGI IRIX Documentation: A...B shortcut for checkout and rebase Documentation/pretty-{formats,options}: better reference for "format:<string>"
2010-06-02git-compat-util.h: use apparently more common __sgi macro to detect SGI IRIXLibravatar Gary V. Vaughan1-1/+1
IRIX 6.5.26m does not define the 'sgi' macro, but it does define an '__sgi' macro. Since later IRIX versions (6.5.29m) define both macros, and since an underscore prefixed macro is preferred anyway, use '__sgi' to detect compilation on SGI IRIX. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Gary V. Vaughan <gary@thewrittenword.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-06-02Documentation: A...B shortcut for checkout and rebaseLibravatar Michael J Gruber2-0/+8
Describe the A...B shortcuts for checkout and rebase [-i] which were introduced in these commits: 619a64e ("checkout A...B" switches to the merge base between A and B, 2009-10-18) 61dfa1b ("rebase --onto A...B" replays history on the merge base between A and B, 2009-11-20) 230a456 (rebase -i: teach --onto A...B syntax, 2010-01-07) Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-06-02Documentation/pretty-{formats,options}: better reference for "format:<string>"Libravatar Nazri Ramliy2-4/+5
In "git help log" (and friends) it's not easy to find the possible placeholder for <string> for the "--pretty=format:<string>" option to git log. This patch makes the placeholder easier to find by adding a reference to the "PRETTY FORMATS" section and repeating the "format:<string>" phrase. Signed-off-by: Nazri Ramliy <ayiehere@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-05-31Merge branch 'maint'Libravatar Junio C Hamano2-1/+8
* maint: Documentation/SubmittingPatches: Fix typo in GMail section Documentation/config: describe status.submodulesummary
2010-05-31Merge branch 'maint-1.7.0' into maintLibravatar Junio C Hamano1-0/+7
* maint-1.7.0: Documentation/config: describe status.submodulesummary
2010-05-31gitignore.5: Clarify matching rulesLibravatar Jonathan Nieder1-5/+9
Patterns containing a / are implicitly anchored to the directory containing the relevant .gitignore file. Patterns not containing a / are textual matches against the path name relative to the directory containing .gitignore. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 01:58:53 +0000