summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/send-email-reconfirm-fix' into maintJunio C Hamano2012-09-141-2/+4
|\
| * send-email: initial_to and initial_reply_to are both optionalStephen Boyd2012-09-061-2/+4
* | Merge branch 'jc/send-email-reconfirm' into maintJunio C Hamano2012-09-141-3/+13
|\ \ | |/
| * send-email: validate & reconfirm interactive responsesJunio C Hamano2012-08-141-3/+13
* | Merge branch 'mz/cherry-pick-cmdline-order' into maintJunio C Hamano2012-09-148-11/+60
|\ \
| * | cherry-pick/revert: respect order of revisions to pickMartin von Zweigbergk2012-08-303-3/+7
| * | demonstrate broken 'git cherry-pick three one two'Martin von Zweigbergk2012-08-301-0/+15
| * | teach log --no-walk=unsorted, which avoids sortingMartin von Zweigbergk2012-08-306-9/+40
* | | Sync with 1.7.11.7Junio C Hamano2012-09-1413-14/+147
|\ \ \
| * | | 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
* | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status