summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/config-warn-on-inaccessible-paths'Junio C Hamano2012-09-171-1/+1
|\
| * attr: failure to open a .gitattributes file is OK with ENOTDIRJunio C Hamano2012-09-131-1/+1
* | Merge branch 'jw/doc-commit-title'Junio C Hamano2012-09-177-22/+31
|\ \
| * | Documentation: describe subject more preciselyJeremy White2012-09-137-22/+31
* | | Merge branch 'mh/string-list'Junio C Hamano2012-09-177-10/+502
|\ \ \
| * | | api-string-list.txt: initialize the string_list the easy wayMichael Haggerty2012-09-121-2/+1
| * | | string_list: add a function string_list_longest_prefix()Michael Haggerty2012-09-125-0/+86
| * | | string_list: add a new function, string_list_remove_duplicates()Michael Haggerty2012-09-125-0/+60
| * | | string_list: add a new function, filter_string_list()Michael Haggerty2012-09-125-0/+96
| * | | string_list: add two new functions for splitting stringsMichael Haggerty2012-09-127-1/+213
| * | | string_list: add function string_list_append_nodup()Michael Haggerty2012-09-123-8/+47
* | | | Merge branch 'jc/maint-blame-no-such-path'Junio C Hamano2012-09-172-17/+74
|\ \ \ \
| * | | | blame: allow "blame file" in the middle of a conflicted mergeJunio C Hamano2012-09-112-25/+70
| * | | | blame $path: avoid getting fooled by case insensitive filesystemsJunio C Hamano2012-09-102-4/+16
* | | | | Draft release notes to 1.8.0Junio C Hamano2012-09-141-0/+7
* | | | | 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
View Lorry Controller Status