summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/ll-merge-binary-ours'Junio C Hamano2012-09-145-12/+41
|\
| * ll-merge: warn about inability to merge binary files only when we can'tJunio C Hamano2012-09-121-3/+4
| * attr: "binary" attribute should choose built-in "binary" merge driverJunio C Hamano2012-09-083-3/+3
| * merge: teach -Xours/-Xtheirs to binary ll-merge driverJunio C Hamano2012-09-083-7/+35
* | Merge branch 'cn/branch-set-upstream-to'Junio C Hamano2012-09-141-1/+5
|\ \
| * | completion: complete branch name for "branch --set-upstream-to="Michael J Gruber2012-09-111-0/+3
| * | completion: add --set-upstream-to and --unset-upstreamCarlos Martín Nieto2012-09-111-1/+2
* | | Merge branch 'sl/autoconf'Junio C Hamano2012-09-142-124/+84
|\ \ \
| * | | build: don't duplicate substitution of make variablesStefano Lattarini2012-09-112-117/+76
| * | | build: improve GIT_CONF_SUBST signatureStefano Lattarini2012-09-111-7/+8
* | | | Merge branch 'dg/run-command-child-cleanup'Junio C Hamano2012-09-141-6/+7
|\ \ \ \
| * | | | run-command.c: fix broken list iteration in clear_child_for_cleanupDavid Gould2012-09-111-6/+7
* | | | | Merge branch 'jc/mailinfo-RE'Junio C Hamano2012-09-141-1/+3
|\ \ \ \ \
| * | | | | mailinfo: strip "RE: " prefixJunio C Hamano2012-09-091-1/+3
* | | | | | Merge branch 'maint'Junio C Hamano2012-09-143-48/+117
|\ \ \ \ \ \
| * | | | | | Draft release notes to 1.7.12.1Junio C Hamano2012-09-141-47/+69
| * | | | | | Merge branch 'sb/send-email-reconfirm-fix' into maintJunio C Hamano2012-09-141-2/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/send-email-reconfirm' into maintJunio C Hamano2012-09-141-3/+13
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'mz/cherry-pick-cmdline-order' into maintJunio C Hamano2012-09-148-11/+60
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ 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
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-ident-missing-human-name' into maint-1.7.11Junio C Hamano2012-09-142-3/+20
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'rj/test-regex' into maint-1.7.11Junio C Hamano2012-09-144-0/+27
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'da/gitk-reload-tag-contents' into maint-1.7.11Junio C Hamano2012-09-141-8/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-checkout-fileglob-doc' into maint-1.7.11Junio C Hamano2012-09-142-1/+30
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | The sixth batch for 1.8.0Junio C Hamano2012-09-141-0/+13
* | | | | | | | | | | | | | | | Merge branch 'nd/checkout-option-parsing-fix'Junio C Hamano2012-09-141-116/+158
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | checkout: reorder option handlingNguyễn Thái Ngọc Duy2012-09-111-77/+112
| * | | | | | | | | | | | | | | | checkout: move more parameters to struct checkout_optsNguyễn Thái Ngọc Duy2012-08-291-33/+35
| * | | | | | | | | | | | | | | | checkout: pass "struct checkout_opts *" as const pointerNguyễn Thái Ngọc Duy2012-08-291-16/+21
* | | | | | | | | | | | | | | | | Merge branch 'mh/abspath'Junio C Hamano2012-09-143-20/+66
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | t0060: split absolute path test in two to exercise some of it on WindowsJohannes Sixt2012-09-101-2/+6
| * | | | | | | | | | | | | | | | | t0060: verify that real_path() removes extra slashesMichael Haggerty2012-09-061-0/+18
| * | | | | | | | | | | | | | | | | real_path(): properly handle nonexistent top-level pathsMichael Haggerty2012-09-062-2/+2
| * | | | | | | | | | | | | | | | | t0060: verify that real_path() works correctly with absolute pathsMichael Haggerty2012-09-061-1/+11
| * | | | | | | | | | | | | | | | | real_path(): reject the empty stringMichael Haggerty2012-09-062-1/+4
| * | | | | | | | | | | | | | | | | t0060: verify that real_path() fails if passed the empty stringMichael Haggerty2012-09-061-0/+4
| * | | | | | | | | | | | | | | | | absolute_path(): reject the empty stringMichael Haggerty2012-09-062-2/+4
| * | | | | | | | | | | | | | | | | t0060: verify that absolute_path() fails if passed the empty stringMichael Haggerty2012-09-061-0/+4
| * | | | | | | | | | | | | | | | | t0060: move tests of real_path() from t0000 to hereMichael Haggerty2012-09-062-18/+19
* | | | | | | | | | | | | | | | | | Merge branch 'dj/fetch-all-tags'Junio C Hamano2012-09-142-0/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | fetch --all: pass --tags/--no-tags through to each remoteDan Johnson2012-09-072-0/+34
* | | | | | | | | | | | | | | | | | | Merge branch 'sn/ls-remote-get-url-doc'Junio C Hamano2012-09-142-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | ls-remote: document the '--get-url' optionStefan Naewe2012-09-072-1/+6
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'nd/i18n-status'Junio C Hamano2012-09-141-20/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | status: remove i18n legosNguyễn Thái Ngọc Duy2012-09-061-20/+28
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'rj/path-cleanup'Junio C Hamano2012-09-147-30/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Call mkpathdup() rather than xstrdup(mkpath(...))Ramsay Jones2012-09-044-10/+11
| * | | | | | | | | | | | | | | | | | | Call git_pathdup() rather than xstrdup(git_path("..."))Ramsay Jones2012-09-042-2/+3
View Lorry Controller Status