aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| | * | | | | | | | | | Document file-glob for "git checkout -- '*.c'"Junio C Hamano2012-09-04
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
* | | | | | | | | | | Further merging in preparation for 1.7.12.1Junio C Hamano2012-09-12
* | | | | | | | | | | Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-12
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'jc/apply-binary-p0' into maint-1.7.11Junio C Hamano2012-09-12
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | apply: compute patch->def_name correctly under -p0Junio C Hamano2012-08-24
| * | | | | | | | | | | Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11Junio C Hamano2012-09-12
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | specifying ranges: we did not mean to make ".." an empty setJunio C Hamano2012-08-23
| * | | | | | | | | | | | Merge branch 'jc/maint-doc-checkout-b-always-takes-branch-name' into maint-1....Junio C Hamano2012-09-12
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | doc: "git checkout -b/-B/--orphan" always takes a branch nameJunio C Hamano2012-08-26
| | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'jk/maint-http-half-auth-push' into maint-1.7.11Junio C Hamano2012-09-12
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | http: prompt for credentials on failed POSTJeff King2012-08-27
| | * | | | | | | | | | | | http: factor out http error code handlingJeff King2012-08-27
| | * | | | | | | | | | | | t: test http access to "half-auth" repositoriesJeff King2012-08-27
| | * | | | | | | | | | | | t: test basic smart-http authenticationJeff King2012-08-27
| | * | | | | | | | | | | | t/lib-httpd: recognize */smart/* repos as smart-httpJeff King2012-08-27
| | * | | | | | | | | | | | t/lib-httpd: only route auth/dumb to dumb reposJeff King2012-08-27
| | * | | | | | | | | | | | t5550: factor out http auth setupJeff King2012-08-27
| | * | | | | | | | | | | | t5550: put auth-required repo in auth/dumbJeff King2012-08-27
| | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'kk/maint-for-each-ref-multi-sort' into maint-1.7.11Junio C Hamano2012-09-12
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | for-each-ref: Fix sort with multiple keysKacper Kornet2012-08-21
| | * | | | | | | | | | | | t6300: test sort with multiple keysKacper Kornet2012-08-21
| | | |/ / / / / / / / / / | | |/| | | | | | | | | |
* | | | | | | | | | | | | Further merging down for 1.7.12.1Junio C Hamano2012-09-11
* | | | | | | | | | | | | Sync with 1.7.11.6Junio C Hamano2012-09-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Git 1.7.11.6v1.7.11.6Junio C Hamano2012-09-11
| * | | | | | | | | | | | Merge branch 'jc/maint-mergetool-style-fix' into maint-1.7.11Junio C Hamano2012-09-11
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | mergetool: style fixesJunio C Hamano2012-08-23
| * | | | | | | | | | | | | Merge branch 'sz/submodule-force-update' into maint-1.7.11Junio C Hamano2012-09-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Make 'git submodule update --force' always check out submodules.Stefan Zager2012-08-24
| * | | | | | | | | | | | | | Merge branch 'ph/stash-rerere' into maint-1.7.11Junio C Hamano2012-09-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | stash: invoke rerere in case of conflictPhil Hord2012-08-17
| | * | | | | | | | | | | | | | test: git-stash conflict sets up rererePhil Hord2012-08-17
| | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'jc/maint-sane-execvp-notdir' into maint-1.7.11Junio C Hamano2012-09-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | sane_execvp(): ignore non-directory on $PATHJunio C Hamano2012-07-31
| * | | | | | | | | | | | | | | Merge branch 'jc/maint-config-exit-status' into maint-1.7.11Junio C Hamano2012-09-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | config: "git config baa" should exit with status 1Junio C Hamano2012-07-30
| | | |_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'mh/maint-config-doc-proxy-command' into maint-1.7.11Junio C Hamano2012-09-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | git-config doc: unconfuse an exampleJunio C Hamano2012-08-18
| | * | | | | | | | | | | | | | | git-config.txt: fix exampleMichael Haggerty2012-08-18
| | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'hv/submodule-path-unmatch' into maint-1.7.11Junio C Hamano2012-09-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Let submodule command exit with error status if path does not existHeiko Voigt2012-08-14
| * | | | | | | | | | | | | | | | Merge branch 'mz/empty-rebase-test' into maint-1.7.11Junio C Hamano2012-09-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | add tests for 'git rebase --keep-empty'Martin von Zweigbergk2012-08-09
| * | | | | | | | | | | | | | | | | Merge branch 'jk/docs-docbook-monospace-display' into maint-1.7.11Junio C Hamano2012-09-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | docs: monospace listings in docbook outputJeff King2012-08-07
| | | |_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'ab/diff-write-incomplete-line' into maint-1.7.11Junio C Hamano2012-09-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Fix '\ No newline...' annotation in rewrite diffsAdam Butcher2012-08-05
| * | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-t7406-rev-parse-max-count-huh' into maint-1.7.11Junio C Hamano2012-09-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | t7406: fix misleading "rev-parse --max-count=1 HEAD"Junio C Hamano2012-07-30
| * | | | | | | | | | | | | | | | | | | Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Junio C Hamano2012-09-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | diff_setup_done(): return voidThomas Rast2012-08-03
| | | |_|_|_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |