Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Dec 2, 2009
  1. @gitster

    Git 1.6.6-rc1

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

    git-pull.sh: Fix call to git-merge for new command format

    vonbrand authored gitster committed
    Now "git merge <msg> HEAD" is officially deprecated, we should
    clean our own use as well.
    
    Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      Prepare for 1.6.5.4
      merge: do not add standard message when message is given with -m option
      Do not misidentify "git merge foo HEAD" as an old-style invocation
    
    Conflicts:
    	RelNotes
  4. @gitster

    Prepare for 1.6.5.4

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @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>
  6. @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. @gitster

    Update draft release notes to 1.6.6 before -rc1

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

    Merge branch 'maint'

    gitster authored
    * maint:
      help: Do not unnecessarily look for a repository
      Documentation: Fix a few i.e./e.g. mix-ups
      Documentation: Document --branch option in git clone synopsis
  3. @gitster

    Merge branch 'jc/deprecate-old-syntax-from-merge'

    gitster authored
    * jc/deprecate-old-syntax-from-merge:
      git-merge: a deprecation notice of the ancient command line syntax
  4. @gitster

    git-merge: a deprecation notice of the ancient command line syntax

    gitster authored
    The ancient form of git merge command used in the original sample script
    has been copied from Linus and are still found everywhere, I think, and
    people may still have it in their scripts, but on the other hand, it is so
    unintuitive that even people reasonably familiar with git are surprised by
    accidentally triggering the support to parse this ancient form.
    
    Gently nudge people to upgrade their script to more recent and readable
    style for eventual removal of the original syntax.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @gitster

    Merge branch 'bw/remote-get-ref-states-fix'

    gitster authored
    * bw/remote-get-ref-states-fix:
      get_ref_states: strdup entries and free util in stale list
  6. @bertwesarg @gitster

    get_ref_states: strdup entries and free util in stale list

    bertwesarg authored gitster committed
    The entries in states->stale list is filled in handle_one_branch() that is
    a call-back funcation to for_each_ref() using the callback parameter given
    to it.  We need to strdup() the refnames (both the string list key and the
    value stored in util) for more permanent storage and free them when we are
    done.
    
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. @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>
  8. @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>
  9. @gitster

    Merge branch 'jn/gitweb-blame'

    gitster authored
    * jn/gitweb-blame:
      gitweb: Add link to other blame implementation in blame views
      gitweb: Make linking to actions requiring JavaScript a feature
      gitweb.js: fix padLeftStr() and its usage
      gitweb.js: Harden setting blamed commit info in incremental blame
      gitweb.js: fix null object exception in initials calculation
      gitweb: Minify gitweb.js if JSMIN is defined
      gitweb: Create links leading to 'blame_incremental' using JavaScript
      gitweb: Colorize 'blame_incremental' view during processing
      gitweb: Incremental blame (using JavaScript)
      gitweb: Add optional "time to generate page" info in footer
    
    Conflicts:
    	Makefile
    	gitweb/gitweb.css
  10. @jnareb @gitster

    gitweb: Add link to other blame implementation in blame views

    jnareb authored gitster committed
    Add link to 'blame_incremental' action (which requires JavaScript) in
    'blame' view, and add link to 'blame' action in 'blame_incremental'
    view.
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  11. @jnareb @gitster

    gitweb: Make linking to actions requiring JavaScript a feature

    jnareb authored gitster committed
    Let gitweb turn some links (like 'blame' links) into linking to actions
    which require JavaScript (like 'blame_incremental' action) only if
    'javascript-actions' feature is enabled.
    
    This means that links to such actions would be present only if both
    JavaScript is enabled and 'javascript-actions' feature is enabled.
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 30, 2009
  1. @gitster

    Merge branch 'fc/maint-format-patch-pathspec-dashes'

    gitster authored
    Conflicts:
    	t/t4014-format-patch.sh
  2. @gitster

    Merge branch 'mm/maint-merge-ff-error-message-fix'

    gitster authored
    Conflicts:
    	merge-recursive.c
  3. @gitster
  4. @gitster

    Merge branch 'jc/pretty-lf'

    gitster authored
    Conflicts:
    	pretty.c
    	t/t6006-rev-list-format.sh
  5. @gitster

    Merge branch 'cc/bisect-doc'

    gitster authored
  6. @gitster

    Merge branch 'em/commit-claim'

    gitster authored
  7. @gitster

    Merge branch 'jc/mailinfo-remove-brackets'

    gitster authored
    Conflicts:
    	Documentation/git-mailinfo.txt
    	builtin-mailinfo.c
  8. @gitster
  9. @gitster

    Merge branch 'uk/maint-shortlog-encoding'

    gitster authored
    Conflicts:
    	builtin-shortlog.c
  10. @gitster
  11. @gitster
  12. @gitster
  13. @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>
  14. @moy @gitster

    builtin-merge: show user-friendly error messages for fast-forward too.

    moy authored gitster committed
    fadd069 (merge-recursive: give less scary messages when merge did not
    start, Sep 7 2009) introduced some friendlier error message for merge
    failure, but the messages were shown only for non-fast forward merges.
    This patch uses the same for fast-forward.
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  15. @moy @gitster

    merge-recursive: make the error-message generation an extern function

    moy authored gitster committed
    The construction of the struct unpack_trees_error_msgs was done within
    git_merge_trees(), which prevented using the same messages easily from
    another function.
    
    [jc: backported for 1.6.5 maint before advice_commit_before_merge]
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  16. @gitster

    t/README: Document GIT_TEST_INSTALLED and GIT_TEST_EXEC_PATH

    Matthew Ogilvie authored gitster committed
    These were added without documentation in 2009-03-16 (6720721).
    
    Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  17. @gitster

    t3409 t4107 t7406 t9150: use dashless commands

    Matthew Ogilvie authored gitster committed
    This is needed to allow test suite to run against a standard
    install bin directory instead of GIT_EXEC_PATH.
    
    Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  18. @apenwarr @gitster

    builtin-merge.c: call exclude_cmds() correctly.

    apenwarr authored gitster committed
    We need to call exclude_cmds() after the loop, not during the loop, because
    excluding a command from the array can change the indexes of objects in the
    array.  The result is that, depending on file ordering, some commands
    weren't excluded as they should have been.
    
    Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.