Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Dec 3, 2009
  1. @gitster

    Git 1.6.5.4

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Unconditionally set man.base.url.for.relative.links

    gitster authored
    Even setting it to empty is better than leaving it unset as it
    prevents the warning cruft from appearing in the output.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Documentation/Makefile: allow man.base.url.for.relative.link to be se…

    Junio C Hamano authored
    …t from Make
    
    Signed-off-by: Junio C Hamano <junio@kernel.org>
Commits on Dec 2, 2009
  1. @gitster

    Prepare for 1.6.5.4

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    merge: do not add standard message when message is given with -m option

    gitster authored
    Even if the user explicitly gave her own message to "git merge", the
    command still added its standard merge message.  It resulted in a
    useless repetition like this:
    
        % git merge -m "Merge early part of side branch" `git rev-parse side~2`
        % git show -s
        commit 37217141e7519629353738d5e4e677a15096206f
        Merge: e68e646 a1d2374
        Author: しらいし ななこ <nanako3@lavabit.com>
        Date:   Wed Dec 2 14:33:20 2009 +0900
    
    	Merge early part of side branch
    
    	Merge commit 'a1d2374f8f52f4e8a53171601a920b538a6cec23'
    
    The gave her own message because she didn't want git to add the
    standard message (if she wanted to, she wouldn't have given one,
    or she would have prepared it using git-fmt-merge-msg command).
    
    Noticed by Nanako Shiraishi
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Do not misidentify "git merge foo HEAD" as an old-style invocation

    gitster authored
    This was misinterpreted as an ancient style "git merge <message> HEAD
    <commit> <commit>..." that merges one (or more) <commit> into the current
    branch and record the resulting commit with the given message.  Then a
    later sanity check found that there is no <commit> specified and gave
    a usage message.
    
    Tested-by: Nanako Shiraishi <nanako3@lavabit.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 1, 2009
  1. @davvid @gitster

    help: Do not unnecessarily look for a repository

    davvid authored gitster committed
    Although 'git help' actually doesn't need to be run inside a git
    repository and uses no repository-specific information, it looks for a git
    directory.  Searching for a git directory can be annoying in auto-mount
    environments.  With this commit, 'git help' no longer searches for a
    repository when run without any options.
    
    7c3baa9 originally modified 'git help -a' to not require a repository.
    This applies the same fix for 'git help'.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @mjg @gitster

    Documentation: Fix a few i.e./e.g. mix-ups

    mjg authored gitster committed
    A git bundle can be transported by several means (such as e-mail), not
    only by snekaernet, so use e.g. instead of i.e.
    
    The mix-up in git-bundle.txt is obvious.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 30, 2009
  1. @dsp @gitster

    Documentation: Document --branch option in git clone synopsis

    dsp authored gitster committed
    Document the --branch option as [-b <name>] in git clones synopsis.
    
    Signed-off-by: David Soria Parra <dsp@php.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 27, 2009
  1. @gitster

    builtin-apply.c: pay attention to -p<n> when determining the name

    gitster authored
    The patch structure has def_name component that is used to validate the
    sanity of a "diff --git" patch by checking pathnames that appear on the
    patch header lines for consistency.  The git_header_name() function is
    used to compute this out of "diff --git a/... b/..." line, but the code
    always stripped one level of prefix (i.e. "a/" and "b/"), without paying
    attention to -p<n> option.  Code in find_name() function that parses other
    lines in the patch header (e.g. "--- a/..." and "+++ b/..." lines) however
    did strip the correct number of leading paths prefixes, and the sanity
    check between these computed values failed.
    
    Teach git_header_name() to honor -p<n> option like find_name() function
    does.
    
    Found and reported by Steven J. Murdoch who also wrote tests.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 24, 2009
  1. @npitre @gitster

    pack-objects: split implications of --all-progress from progress acti…

    npitre authored gitster committed
    …vation
    
    Currently the --all-progress flag is used to use force progress display
    during the writing object phase even if output goes to stdout which is
    primarily the case during a push operation.  This has the unfortunate
    side effect of forcing progress display even if stderr is not a
    terminal.
    
    Let's introduce the --all-progress-implied argument which has the same
    intent except for actually forcing the activation of any progress
    display.  With this, progress display will be automatically inhibited
    whenever stderr is not a terminal, or full progress display will be
    included otherwise.  This should let people use 'git push' within a cron
    job without filling their logs with useless percentage displays.
    
    Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
    Tested-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @bebarino @gitster

    instaweb: restart server if already running

    bebarino authored gitster committed
    Running 'git instaweb' when an instaweb server is already running will
    fail (at least when the port is the same) and overwrite the pid file
    used to track the currently running server. This turns out to be
    especially annoying when the user tries to stop the previously running
    server with 'git instaweb --stop' and is instead greeted with an error
    message because the pid file has been destroyed.
    
    Instead of allowing a user to start two instaweb servers, stop the
    currently running server first and then start the new one. This should
    be fine because it was never really possible to start two instaweb
    servers in the first place due to the pid file issue outlined above.
    
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @peff @gitster

    prune-packed: only show progress when stderr is a tty

    peff authored gitster committed
    This matches the behavior of other git programs, and helps
    keep cruft out of things like cron job output.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 20, 2009
  1. @gitster

    Documentation: undocument gc'd function graph_release()

    Greg Price authored gitster committed
    graph_release() was removed in 064bfbd.  Cut it from the API
    documentation and a comment.
    
    Signed-off-by: Greg Price <price@ksplice.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 16, 2009
  1. @gitster

    Git 1.6.5.3

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Merge branch 'bs/maint-pre-commit-hook-sample' into maint

    gitster authored
    * bs/maint-pre-commit-hook-sample:
      pre-commit.sample: Diff against the empty tree when HEAD is invalid
  3. @gitster

    Merge branch 'jk/maint-add-p-empty' into maint

    gitster authored
    * jk/maint-add-p-empty:
      add-interactive: handle deletion of empty files
  4. @gitster

    Merge branch 'js/maint-diff-color-words' into maint

    gitster authored
    * js/maint-diff-color-words:
      diff --color-words: bit of clean-up
      diff --color-words -U0: fix the location of hunk headers
      t4034-diff-words: add a test for word diff without context
    
    Conflicts:
    	diff.c
  5. @gitster

    Merge branch 'tz/maint-rpm' into maint

    gitster authored
    * tz/maint-rpm:
      Makefile: Ensure rpm packages can be read by older rpm versions
  6. @gitster

    Merge branch 'jk/maint-format-patch-p-suppress-stat' into maint

    gitster authored
    * jk/maint-format-patch-p-suppress-stat:
      format-patch: make "-p" suppress diffstat
  7. @gitster

    Merge branch 'pb/maint-gitweb-blob-lineno' into maint

    gitster authored
    * pb/maint-gitweb-blob-lineno:
      gitweb: Fix blob linenr links in pathinfo mode
  8. @gitster

    Merge branch 'jk/maint-1.6.3-ls-files-i' into maint

    gitster authored
    * jk/maint-1.6.3-ls-files-i:
      ls-files: unbreak "ls-files -i"
  9. @gitster

    Merge branch 'vl/maint-openssl-signature-change' into maint

    gitster authored
    * vl/maint-openssl-signature-change:
      imap-send.c: fix compiler warnings for OpenSSL 1.0
  10. @gitster

    Merge branch 'jk/maint-push-config' into maint

    gitster authored
    * jk/maint-push-config:
      push: always load default config
  11. @gitster

    Merge branch 'sr/blame-incomplete' into maint

    gitster authored
    * sr/blame-incomplete:
      blame: make sure that the last line ends in an LF
  12. @gitster

    Merge branch 'jc/maint-blank-at-eof' into maint

    gitster authored
    * jc/maint-blank-at-eof:
      diff -B: colour whitespace errors
      diff.c: emit_add_line() takes only the rest of the line
      diff.c: split emit_line() from the first char and the rest of the line
      diff.c: shuffling code around
      diff --whitespace: fix blank lines at end
      core.whitespace: split trailing-space into blank-at-{eol,eof}
      diff --color: color blank-at-eof
      diff --whitespace=warn/error: fix blank-at-eof check
      diff --whitespace=warn/error: obey blank-at-eof
      diff.c: the builtin_diff() deals with only two-file comparison
      apply --whitespace: warn blank but not necessarily empty lines at EOF
      apply --whitespace=warn/error: diagnose blank at EOF
      apply.c: split check_whitespace() into two
      apply --whitespace=fix: detect new blank lines at eof correctly
      apply --whitespace=fix: fix handling of blank lines at the eof
  13. @gitster

    Merge branch 'jc/maint-1.6.3-graft-trailing-space' into maint

    gitster authored
    * jc/maint-1.6.3-graft-trailing-space:
      info/grafts: allow trailing whitespaces at the end of line
  14. @gitster

    Merge branch 'tr/maint-roff-quote' into maint

    gitster authored
    * tr/maint-roff-quote:
      Quote ' as \(aq in manpages
  15. @gitster

    Merge branch 'ja/fetch-doc' into maint

    gitster authored
    * ja/fetch-doc:
      Documentation/merge-options.txt: order options in alphabetical groups
      Documentation/git-pull.txt: Add subtitles above included option files
      Documentation/fetch-options.txt: order options alphabetically
  16. @gitster

    Merge branch 'cb/doc-fetch-pull-merge' into maint

    gitster authored
    * cb/doc-fetch-pull-merge:
      modernize fetch/merge/pull examples
  17. @gitster

    Merge branch 'jk/maint-cvsimport-pathname' into maint

    gitster authored
    * jk/maint-cvsimport-pathname:
      cvsimport: fix relative argument filenames
  18. @gitster

    Merge branch 'jc/receive-pack-auto' into maint

    gitster authored
    * jc/receive-pack-auto:
      receive-pack: run "gc --auto --quiet" and optionally "update-server-info"
      gc --auto --quiet: make the notice a bit less verboase
  19. @gitster

    Merge branch 'gb/maint-gitweb-esc-param' into maint

    gitster authored
    * gb/maint-gitweb-esc-param:
      gitweb: fix esc_param
  20. @gitster

    Merge branch 'jn/gitweb-patch' into maint

    gitster authored
    * jn/gitweb-patch:
      gitweb: Do not show 'patch' link for merge commits
Commits on Nov 14, 2009
  1. @tmzullinger @gitster

    Makefile: Ensure rpm packages can be read by older rpm versions

    tmzullinger authored gitster committed
    The kernel.org hosts where the packages are built are now using Fedora
    11, which defaults to sha256 for file digests instead of md5.  Older
    versions of rpm can not handle these packages.  Tell rpmbuild to use md5
    file digests for better compatibility.
    
    Signed-off-by: Todd Zullinger <tmz@pobox.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.