Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | daemon: log errors if we could not use some socketsnd/daemon-log-sock-errors | Nguyễn Thái Ngọc Duy | 2011-10-03 | 1 | -0/+37 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'cp/git-web-browse-browsers' | Junio C Hamano | 2011-10-13 | 2 | -5/+71 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-web--browse: avoid the use of evalcp/git-web-browse-browsers | Chris Packham | 2011-10-03 | 2 | -5/+71 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jc/apply-blank-at-eof-fix' | Junio C Hamano | 2011-10-13 | 1 | -2/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | apply --whitespace=error: correctly report new blank lines at end | Junio C Hamano | 2011-09-26 | 1 | -2/+9 |
* | | | | | | | | | Merge branch 'di/fast-import-empty-tag-note-fix' | Junio C Hamano | 2011-10-13 | 2 | -0/+33 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fast-import: don't allow to note on empty branchdi/fast-import-empty-tag-note-fix | Dmitry Ivankov | 2011-09-22 | 2 | -0/+19 |
| * | | | | | | | | | fast-import: don't allow to tag empty branch | Dmitry Ivankov | 2011-09-22 | 2 | -0/+14 |
* | | | | | | | | | | Merge branch 'nd/maint-autofix-tag-in-head' | Junio C Hamano | 2011-10-13 | 7 | -65/+93 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Accept tags in HEAD or MERGE_HEAD | Nguyễn Thái Ngọc Duy | 2011-09-18 | 7 | -14/+34 |
| * | | | | | | | | | | merge: remove global variable head[] | Nguyễn Thái Ngọc Duy | 2011-09-18 | 1 | -44/+53 |
| * | | | | | | | | | | merge: use return value of resolve_ref() to determine if HEAD is invalid | Nguyễn Thái Ngọc Duy | 2011-09-18 | 1 | -1/+1 |
| * | | | | | | | | | | merge: keep stash[] a local variable | Nguyễn Thái Ngọc Duy | 2011-08-26 | 1 | -17/+16 |
* | | | | | | | | | | | Merge branch 'bw/grep-no-index-no-exclude' | Junio C Hamano | 2011-10-13 | 2 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | grep --no-index: don't use git standard exclusionsbw/grep-no-index-no-exclude | Bert Wesarg | 2011-09-15 | 2 | -2/+1 |
| * | | | | | | | | | | grep: do not use --index in the short usage output | Bert Wesarg | 2011-09-15 | 1 | -2/+3 |
* | | | | | | | | | | | Merge branch 'nd/maint-sparse-errors' | Junio C Hamano | 2011-10-13 | 2 | -4/+32 |
|\ \ \ \ \ \ \ \ \ \ \ |