summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 1.7.11.7v1.7.11.7maint-1.7.11Junio C Hamano2012-09-144-3/+50
* Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log' into maint-1.7.11Junio C Hamano2012-09-142-1/+13
|\
| * log: fix --quiet synonym for -sJeff King2012-08-282-1/+13
* | Merge branch 'jc/maint-ident-missing-human-name' into maint-1.7.11Junio C Hamano2012-09-142-3/+20
|\ \
| * | split_ident_line(): make best effort when parsing author/committer lineJunio C Hamano2012-08-312-3/+20
| |/
* | Merge branch 'rj/test-regex' into maint-1.7.11Junio C Hamano2012-09-144-0/+27
|\ \
| * | test-regex: Add a test to check for a bug in the regex routinesRamsay Jones2012-09-024-0/+27
* | | Merge branch 'da/gitk-reload-tag-contents' into maint-1.7.11Junio C Hamano2012-09-141-8/+9
|\ \ \
| * | | gitk: Rename 'tagcontents' to 'cached_tagcontent'David Aguilar2012-09-081-7/+7
| * | | gitk: Teach "Reread references" to reload tagsDavid Aguilar2012-09-081-1/+2
| * | | gitk: Avoid Meta1-F5Felipe Contreras2012-04-251-2/+2
* | | | Merge branch 'jc/maint-checkout-fileglob-doc' into maint-1.7.11Junio C Hamano2012-09-142-1/+30
|\ \ \ \
| * | | | gitcli: contrast wildcard given to shell and to gitJunio C Hamano2012-09-101-0/+17
| * | | | gitcli: formatting fixJunio C Hamano2012-09-101-1/+1
| * | | | Document file-glob for "git checkout -- '*.c'"Junio C Hamano2012-09-041-0/+12
* | | | | Merge branch 'jc/apply-binary-p0' into maint-1.7.11Junio C Hamano2012-09-122-46/+76
|\ \ \ \ \
| * | | | | apply: compute patch->def_name correctly under -p0Junio C Hamano2012-08-242-46/+76
* | | | | | Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11Junio C Hamano2012-09-125-4/+56
|\ \ \ \ \ \
| * | | | | | specifying ranges: we did not mean to make ".." an empty setJunio C Hamano2012-08-235-4/+56
* | | | | | | Merge branch 'jc/maint-doc-checkout-b-always-takes-branch-name' into maint-1....Junio C Hamano2012-09-121-3/+3
|\ \ \ \ \ \ \
| * | | | | | | doc: "git checkout -b/-B/--orphan" always takes a branch nameJunio C Hamano2012-08-261-3/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jk/maint-http-half-auth-push' into maint-1.7.11Junio C Hamano2012-09-129-106/+171
|\ \ \ \ \ \ \
| * | | | | | | http: prompt for credentials on failed POSTJeff King2012-08-272-9/+16
| * | | | | | | http: factor out http error code handlingJeff King2012-08-272-23/+29
| * | | | | | | t: test http access to "half-auth" repositoriesJeff King2012-08-273-0/+28
| * | | | | | | t: test basic smart-http authenticationJeff King2012-08-272-0/+25
| * | | | | | | t/lib-httpd: recognize */smart/* repos as smart-httpJeff King2012-08-271-9/+7
| * | | | | | | t/lib-httpd: only route auth/dumb to dumb reposJeff King2012-08-271-1/+1
| * | | | | | | t5550: factor out http auth setupJeff King2012-08-273-54/+55
| * | | | | | | t5550: put auth-required repo in auth/dumbJeff King2012-08-271-9/+9
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'kk/maint-for-each-ref-multi-sort' into maint-1.7.11Junio C Hamano2012-09-122-1/+13
|\ \ \ \ \ \ \
| * | | | | | | for-each-ref: Fix sort with multiple keysKacper Kornet2012-08-212-2/+4
| * | | | | | | t6300: test sort with multiple keysKacper Kornet2012-08-211-0/+10
| | |/ / / / / | |/| | | | |
* | | | | | | Git 1.7.11.6v1.7.11.6Junio C Hamano2012-09-113-35/+58
* | | | | | | Merge branch 'jc/maint-mergetool-style-fix' into maint-1.7.11Junio C Hamano2012-09-111-273/+308
|\ \ \ \ \ \ \
| * | | | | | | mergetool: style fixesJunio C Hamano2012-08-231-273/+308
* | | | | | | | Merge branch 'sz/submodule-force-update' into maint-1.7.11Junio C Hamano2012-09-113-2/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | Make 'git submodule update --force' always check out submodules.Stefan Zager2012-08-243-2/+21
* | | | | | | | | Merge branch 'ph/stash-rerere' into maint-1.7.11Junio C Hamano2012-09-112-0/+39
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | stash: invoke rerere in case of conflictPhil Hord2012-08-172-1/+2
| * | | | | | | | | test: git-stash conflict sets up rererePhil Hord2012-08-171-0/+38
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/maint-sane-execvp-notdir' into maint-1.7.11Junio C Hamano2012-09-111-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | sane_execvp(): ignore non-directory on $PATHJunio C Hamano2012-07-311-0/+2
* | | | | | | | | | Merge branch 'jc/maint-config-exit-status' into maint-1.7.11Junio C Hamano2012-09-113-6/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | config: "git config baa" should exit with status 1Junio C Hamano2012-07-303-6/+11
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'mh/maint-config-doc-proxy-command' into maint-1.7.11Junio C Hamano2012-09-111-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-config doc: unconfuse an exampleJunio C Hamano2012-08-181-1/+1
| * | | | | | | | | | git-config.txt: fix exampleMichael Haggerty2012-08-181-1/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'hv/submodule-path-unmatch' into maint-1.7.11Junio C Hamano2012-09-112-7/+52
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Let submodule command exit with error status if path does not existHeiko Voigt2012-08-142-7/+52
View Lorry Controller Status