summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git-svn: Allow certain refs to be ignoredMichael Olson2011-10-161-5/+33
* git svn dcommit: new option --interactive.Frédéric Heitzmann2011-10-163-1/+146
* Sync with maintJunio C Hamano2011-10-152-41/+39
|\
| * Prepare for 1.7.7.1Junio C Hamano2011-10-152-1/+40
| * Merge branch 'ms/patch-id-with-overlong-line' into maintJunio C Hamano2011-10-151-4/+6
| |\
| * \ Merge branch 'jc/maint-bundle-too-quiet' into maintJunio C Hamano2011-10-154-5/+10
| |\ \
| * \ \ Merge branch 'jk/filter-branch-require-clean-work-tree' into maintJunio C Hamano2011-10-151-3/+1
| |\ \ \
| * \ \ \ Merge branch 'jc/maint-fsck-fwrite-size-check' into maintJunio C Hamano2011-10-151-6/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'bk/ancestry-path' into maintJunio C Hamano2011-10-153-10/+101
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/maint-fetch-submodule-check-fix' into maintJunio C Hamano2011-10-151-5/+72
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'tr/mergetool-valgrind' into maintJunio C Hamano2011-10-151-0/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'nm/grep-object-sha1-lock' into maintJunio C Hamano2011-10-151-0/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/diff-index-unpack' into maintJunio C Hamano2011-10-155-6/+38
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'mm/rebase-i-exec-edit' into maintJunio C Hamano2011-10-152-4/+40
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/grep-untracked-exclude'Junio C Hamano2011-10-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-excludeJunio C Hamano2011-10-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | grep: fix the error message that mentions --excludejc/maint-grep-untracked-excludeBert Wesarg2011-10-151-1/+1
* | | | | | | | | | | | | | send-email: Fix %config_path_settings handlingCord Seele2011-10-142-2/+38
* | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-10-141-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | t1304: fall back to $USER if $LOGNAME is not definedRené Scharfe2011-10-141-0/+5
* | | | | | | | | | | | | | Update draft release notes to 1.7.8Junio C Hamano2011-10-131-1/+40
* | | | | | | | | | | | | | Merge branch 'js/maint-merge-one-file-osx-expr'Junio C Hamano2011-10-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | merge-one-file: fix "expr: non-numeric argument"Jay Soffian2011-10-061-1/+1
* | | | | | | | | | | | | | | Merge branch 'jn/ident-from-etc-mailname'Junio C Hamano2011-10-132-23/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | ident: do not retrieve default ident when unnecessaryjn/ident-from-etc-mailnameJonathan Nieder2011-10-061-8/+8
| * | | | | | | | | | | | | | | ident: check /etc/mailname if email is unknownJonathan Nieder2011-10-032-15/+61
* | | | | | | | | | | | | | | | Merge branch 'il/archive-err-signal'Junio C Hamano2011-10-131-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Support ERR in remote archive like in fetch/pushIlari Liusvaara2011-10-051-0/+2
* | | | | | | | | | | | | | | | | Merge branch 'jc/grep-untracked-exclude'Junio C Hamano2011-10-133-10/+65
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-excludeJunio C Hamano2011-10-043-13/+68
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / | |/| | | | / / / / / / / / / / / | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | grep: teach --untracked and --exclude-standard optionsJunio C Hamano2011-10-043-9/+65
* | | | | | | | | | | | | | | | Merge branch 'rs/diff-cleanup-records-fix'Junio C Hamano2011-10-133-3/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | diff: resurrect XDF_NEED_MINIMAL with --minimalJunio C Hamano2011-10-032-0/+8
| * | | | | | | | | | | | | | | | Revert removal of multi-match discard heuristic in 27af01René Scharfe2011-09-261-3/+7
* | | | | | | | | | | | | | | | | Merge branch 'rs/pending'Junio C Hamano2011-10-138-49/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | commit: factor out clear_commit_marks_for_object_arrayrs/pendingRené Scharfe2011-10-035-14/+19
| * | | | | | | | | | | | | | | | | checkout: use leak_pending flagRené Scharfe2011-10-031-13/+12
| * | | | | | | | | | | | | | | | | bundle: use leak_pending flagRené Scharfe2011-10-031-5/+3
| * | | | | | | | | | | | | | | | | bisect: use leak_pending flagRené Scharfe2011-10-031-5/+8
| * | | | | | | | | | | | | | | | | revision: add leak_pending flagRené Scharfe2011-10-032-1/+3
| * | | | | | | | | | | | | | | | | checkout: use add_pending_{object,sha1} in orphan checkRené Scharfe2011-10-031-27/+12
| * | | | | | | | | | | | | | | | | revision: factor out add_pending_sha1René Scharfe2011-10-032-3/+9
| * | | | | | | | | | | | | | | | | checkout: check for "Previous HEAD" notice in t2020René Scharfe2011-10-031-2/+5
| | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jn/no-g-plus-s-on-bsd'Junio C Hamano2011-10-131-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Makefile: do not set setgid bit on directories on GNU/kFreeBSDJonathan Nieder2011-10-031-0/+1
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jc/is-url-simplify'Junio C Hamano2011-10-131-26/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | url.c: simplify is_url()jc/is-url-simplifyJunio C Hamano2011-10-031-26/+6
* | | | | | | | | | | | | | | | | | Merge branch 'nd/git-daemon-error-msgs'Junio C Hamano2011-10-131-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | daemon: return "access denied" if a service is not allowednd/git-daemon-error-msgsNguyễn Thái Ngọc Duy2011-10-031-4/+8
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'nd/daemon-log-sock-errors'Junio C Hamano2011-10-131-0/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \