summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Documentation: describe subject more preciselyJeremy White2012-09-137-22/+31
* Further merging in preparation for 1.7.12.1Junio C Hamano2012-09-121-0/+26
* Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-1219-162/+321
|\
| * 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
| | | |/ / / | | |/| | |
* | | | | | Further merging down for 1.7.12.1Junio C Hamano2012-09-111-0/+13
* | | | | | Sync with 1.7.11.6Junio C Hamano2012-09-1132-392/+569
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
| * | | | | | | | | Merge branch 'mz/empty-rebase-test' into maint-1.7.11Junio C Hamano2012-09-111-1/+17
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | add tests for 'git rebase --keep-empty'Martin von Zweigbergk2012-08-091-1/+17
| * | | | | | | | | | Merge branch 'jk/docs-docbook-monospace-display' into maint-1.7.11Junio C Hamano2012-09-112-3/+3
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | docs: monospace listings in docbook outputJeff King2012-08-072-3/+3
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'ab/diff-write-incomplete-line' into maint-1.7.11Junio C Hamano2012-09-112-0/+31
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix '\ No newline...' annotation in rewrite diffsAdam Butcher2012-08-052-0/+31
| * | | | | | | | | | | Merge branch 'jc/maint-t7406-rev-parse-max-count-huh' into maint-1.7.11Junio C Hamano2012-09-111-8/+8
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | t7406: fix misleading "rev-parse --max-count=1 HEAD"Junio C Hamano2012-07-301-8/+8
| * | | | | | | | | | | | Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Junio C Hamano2012-09-1113-32/+16
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | diff_setup_done(): return voidThomas Rast2012-08-0313-32/+16
| | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
View Lorry Controller Status