Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | git-svn: Allow certain refs to be ignored | Michael Olson | 2011-10-16 | 1 | -5/+33 |
* | git svn dcommit: new option --interactive. | Frédéric Heitzmann | 2011-10-16 | 3 | -1/+146 |
* | Sync with maint | Junio C Hamano | 2011-10-15 | 2 | -41/+39 |
|\ | |||||
| * | Prepare for 1.7.7.1 | Junio C Hamano | 2011-10-15 | 2 | -1/+40 |
| * | Merge branch 'ms/patch-id-with-overlong-line' into maint | Junio C Hamano | 2011-10-15 | 1 | -4/+6 |
| |\ | |||||
| * \ | Merge branch 'jc/maint-bundle-too-quiet' into maint | Junio C Hamano | 2011-10-15 | 4 | -5/+10 |
| |\ \ | |||||
| * \ \ | Merge branch 'jk/filter-branch-require-clean-work-tree' into maint | Junio C Hamano | 2011-10-15 | 1 | -3/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jc/maint-fsck-fwrite-size-check' into maint | Junio C Hamano | 2011-10-15 | 1 | -6/+3 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'bk/ancestry-path' into maint | Junio C Hamano | 2011-10-15 | 3 | -10/+101 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jk/maint-fetch-submodule-check-fix' into maint | Junio C Hamano | 2011-10-15 | 1 | -5/+72 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'tr/mergetool-valgrind' into maint | Junio C Hamano | 2011-10-15 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'nm/grep-object-sha1-lock' into maint | Junio C Hamano | 2011-10-15 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jc/diff-index-unpack' into maint | Junio C Hamano | 2011-10-15 | 5 | -6/+38 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'mm/rebase-i-exec-edit' into maint | Junio C Hamano | 2011-10-15 | 2 | -4/+40 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/grep-untracked-exclude' | Junio C Hamano | 2011-10-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude | Junio C Hamano | 2011-10-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | grep: fix the error message that mentions --excludejc/maint-grep-untracked-exclude | Bert Wesarg | 2011-10-15 | 1 | -1/+1 |
* | | | | | | | | | | | | | | send-email: Fix %config_path_settings handling | Cord Seele | 2011-10-14 | 2 | -2/+38 |
* | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-10-14 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | t1304: fall back to $USER if $LOGNAME is not defined | René Scharfe | 2011-10-14 | 1 | -0/+5 |
* | | | | | | | | | | | | | | Update draft release notes to 1.7.8 | Junio C Hamano | 2011-10-13 | 1 | -1/+40 |
* | | | | | | | | | | | | | | Merge branch 'js/maint-merge-one-file-osx-expr' | Junio C Hamano | 2011-10-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | merge-one-file: fix "expr: non-numeric argument" | Jay Soffian | 2011-10-06 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | Merge branch 'jn/ident-from-etc-mailname' | Junio C Hamano | 2011-10-13 | 2 | -23/+69 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | ident: do not retrieve default ident when unnecessaryjn/ident-from-etc-mailname | Jonathan Nieder | 2011-10-06 | 1 | -8/+8 |
| * | | | | | | | | | | | | | | | ident: check /etc/mailname if email is unknown | Jonathan Nieder | 2011-10-03 | 2 | -15/+61 |
* | | | | | | | | | | | | | | | | Merge branch 'il/archive-err-signal' | Junio C Hamano | 2011-10-13 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Support ERR in remote archive like in fetch/push | Ilari Liusvaara | 2011-10-05 | 1 | -0/+2 |
* | | | | | | | | | | | | | | | | | Merge branch 'jc/grep-untracked-exclude' | Junio C Hamano | 2011-10-13 | 3 | -10/+65 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude | Junio C Hamano | 2011-10-04 | 3 | -13/+68 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / | |/| | | | / / / / / / / / / / / | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | grep: teach --untracked and --exclude-standard options | Junio C Hamano | 2011-10-04 | 3 | -9/+65 |
* | | | | | | | | | | | | | | | | Merge branch 'rs/diff-cleanup-records-fix' | Junio C Hamano | 2011-10-13 | 3 | -3/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | diff: resurrect XDF_NEED_MINIMAL with --minimal | Junio C Hamano | 2011-10-03 | 2 | -0/+8 |
| * | | | | | | | | | | | | | | | | Revert removal of multi-match discard heuristic in 27af01 | René Scharfe | 2011-09-26 | 1 | -3/+7 |
* | | | | | | | | | | | | | | | | | Merge branch 'rs/pending' | Junio C Hamano | 2011-10-13 | 8 | -49/+64 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | commit: factor out clear_commit_marks_for_object_arrayrs/pending | René Scharfe | 2011-10-03 | 5 | -14/+19 |
| * | | | | | | | | | | | | | | | | | checkout: use leak_pending flag | René Scharfe | 2011-10-03 | 1 | -13/+12 |
| * | | | | | | | | | | | | | | | | | bundle: use leak_pending flag | René Scharfe | 2011-10-03 | 1 | -5/+3 |
| * | | | | | | | | | | | | | | | | | bisect: use leak_pending flag | René Scharfe | 2011-10-03 | 1 | -5/+8 |
| * | | | | | | | | | | | | | | | | | revision: add leak_pending flag | René Scharfe | 2011-10-03 | 2 | -1/+3 |
| * | | | | | | | | | | | | | | | | | checkout: use add_pending_{object,sha1} in orphan check | René Scharfe | 2011-10-03 | 1 | -27/+12 |
| * | | | | | | | | | | | | | | | | | revision: factor out add_pending_sha1 | René Scharfe | 2011-10-03 | 2 | -3/+9 |
| * | | | | | | | | | | | | | | | | | checkout: check for "Previous HEAD" notice in t2020 | René Scharfe | 2011-10-03 | 1 | -2/+5 |
| | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'jn/no-g-plus-s-on-bsd' | Junio C Hamano | 2011-10-13 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | Makefile: do not set setgid bit on directories on GNU/kFreeBSD | Jonathan Nieder | 2011-10-03 | 1 | -0/+1 |
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'jc/is-url-simplify' | Junio C Hamano | 2011-10-13 | 1 | -26/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | url.c: simplify is_url()jc/is-url-simplify | Junio C Hamano | 2011-10-03 | 1 | -26/+6 |
* | | | | | | | | | | | | | | | | | | Merge branch 'nd/git-daemon-error-msgs' | Junio C Hamano | 2011-10-13 | 1 | -4/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | daemon: return "access denied" if a service is not allowednd/git-daemon-error-msgs | Nguyễn Thái Ngọc Duy | 2011-10-03 | 1 | -4/+8 |
| |/ / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | Merge branch 'nd/daemon-log-sock-errors' | Junio C Hamano | 2011-10-13 | 1 | -0/+37 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |