• Junio C Hamano's avatar
    Merge branch 'master' into lj/refs · 2958d9b5
    Junio C Hamano authored
    * master: (72 commits)
      runstatus: do not recurse into subdirectories if not needed
      grep: fix --fixed-strings combined with expression.
      grep: free expressions and patterns when done.
      Corrected copy-and-paste thinko in ignore executable bit test case.
      An illustration of rev-list --parents --pretty=raw
      Allow git-checkout when on a non-existant branch.
      gitweb: Decode long title for link tooltips
      git-svn: Fix fetch --no-ignore-externals with GIT_SVN_NO_LIB=1
      Ignore executable bit when adding files if filemode=0.
      Remove empty ref directories that prevent creating a ref.
      Use const for interpolate arguments
      git-archive: update documentation
      Deprecate merge-recursive.py
      gitweb: fix over-eager application of esc_html().
      Allow '(no author)' in git-svn's authors file.
      Allow 'svn fetch' on '(no date)' revisions in Subversion.
      git-repack: allow git-repack to run in subdirectory
      Remove upload-tar and make git-tar-tree a thin wrapper to git-archive
      git-tar-tree: Move code for git-archive --format=tar to archive-tar.c
      git-tar-tree: Remove duplicate git_config() call
builtin-update-index.c 16.5 KB