summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* build: improve GIT_CONF_SUBST signatureStefano Lattarini2012-09-111-7/+8
* First half of the fifth batch for 1.8.0Junio C Hamano2012-09-101-0/+24
* Merge branch 'cn/branch-set-upstream-to'Junio C Hamano2012-09-103-4/+140
|\
| * branch: deprecate --set-upstream and show help if we detect possible mistaken...Carlos Martín Nieto2012-08-302-0/+60
| * branch: add --unset-upstream optionCarlos Martín Nieto2012-08-303-3/+45
| * branch: introduce --set-upstream-toCarlos Martín Nieto2012-08-233-3/+37
* | Merge branch 'mz/cherry-pick-cmdline-order'Junio C Hamano2012-09-108-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
* | | Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log'Junio C Hamano2012-09-102-1/+13
|\ \ \
| * | | log: fix --quiet synonym for -sJeff King2012-08-282-1/+13
* | | | Merge branch 'ph/credential-gnome-keyring'Junio C Hamano2012-09-103-0/+470
|\ \ \ \
| * | | | contrib: add credential helper for GnomeKeyringPhilipp A. Hartmann2012-08-243-0/+470
| | |_|/ | |/| |
* | | | Cull items fixed in maintenance branchesJunio C Hamano2012-09-101-38/+0
* | | | Sync with "almost" 1.7.12.1Junio C Hamano2012-09-102-1/+91
|\ \ \ \
| * | | | Start preparing for 1.7.12.1Junio C Hamano2012-09-102-1/+63
| * | | | Merge branch 'bc/prune-info' into maintJunio C Hamano2012-09-101-1/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-1027-43/+288
| |\ \ \ \ \
| | * | | | | Almost 1.7.11.6Junio C Hamano2012-09-101-1/+29
| | * | | | | Merge branch 'mg/rebase-i-onto-reflog-in-full' into maint-1.7.11Junio C Hamano2012-09-101-2/+1
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'jc/maint-protect-sh-from-ifs' into maint-1.7.11Junio C Hamano2012-09-101-0/+4
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'bc/receive-pack-stdout-protection' into maint-1.7.11Junio C Hamano2012-09-102-1/+37
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Junio C Hamano2012-09-1018-32/+188
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'tr/maint-send-email-2047' into maint-1.7.11Junio C Hamano2012-09-102-4/+19
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'mm/die-with-dashdash-help' into maint-1.7.11Junio C Hamano2012-09-101-3/+5
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'js/gitweb-path-info-unquote' into maint-1.7.11Junio C Hamano2012-09-101-0/+5
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
* | | | | | | | | | | | | The fourth batch for 1.8.0Junio C Hamano2012-09-071-0/+52
* | | | | | | | | | | | | Merge branch 'nd/branch-v-alignment'Junio C Hamano2012-09-072-13/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | branch -v: align even when branch names are in UTF-8Nguyễn Thái Ngọc Duy2012-08-272-13/+17
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/maint-http-half-auth-push'Junio C Hamano2012-09-079-108/+173
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | 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 'jc/maint-doc-checkout-b-always-takes-branch-name'Junio C Hamano2012-09-071-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | doc: "git checkout -b/-B/--orphan" always takes a branch nameJunio C Hamano2012-08-261-3/+3
* | | | | | | | | | | | | | | Merge branch 'jc/apply-binary-p0'Junio C Hamano2012-09-072-46/+76
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | apply: compute patch->def_name correctly under -p0Junio C Hamano2012-08-242-46/+76
* | | | | | | | | | | | | | | | Merge branch 'jc/dotdot-is-parent-directory'Junio C Hamano2012-09-075-4/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | specifying ranges: we did not mean to make ".." an empty setJunio C Hamano2012-08-235-4/+56
* | | | | | | | | | | | | | | | | Merge branch 'nd/i18n-parseopt-help'Junio C Hamano2012-09-0763-912/+912
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Use imperative form in help usage to describe an actionNguyễn Thái Ngọc Duy2012-08-226-10/+10
| * | | | | | | | | | | | | | | | | Reduce translations by using same terminologiesNguyễn Thái Ngọc Duy2012-08-224-5/+5
| * | | | | | | | | | | | | | | | | i18n: write-tree: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-221-5/+5
| * | | | | | | | | | | | | | | | | i18n: verify-tag: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-221-2/+2
View Lorry Controller Status