summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Sync with 1.7.12.1Junio C Hamano2012-09-185-14/+33
|\
| * Git 1.7.12.1v1.7.12.1Junio C Hamano2012-09-183-2/+14
| * Merge branch 'er/doc-fast-import-done' into maintJunio C Hamano2012-09-181-1/+7
| |\
| | * fast-import: document the --done optionEric S. Raymond2012-08-221-1/+7
| * | Merge branch 'jk/config-warn-on-inaccessible-paths' into maintJunio C Hamano2012-09-186-10/+34
| |\ \
| * | | Doc: Improve shallow depth wordingPhilip Oakley2012-09-181-2/+4
| * | | Documentation/git-filter-branch: Move note about effect of removing commitsAndreas Schwab2012-09-181-10/+9
* | | | The seventh batch for 1.8.0Junio C Hamano2012-09-171-0/+29
* | | | Merge branch 'maint'Junio C Hamano2012-09-175-8/+11
|\ \ \ \ | |/ / /
| * | | t/perf: add "trash directory" to .gitignoreRamkumar Ramachandra2012-09-171-2/+3
| * | | Add missing -z to git check-attr usage text for consistency with man pageAdam Spiers2012-09-171-1/+1
| * | | git-jump: ignore (custom) prefix in diff modeMischa POSLAWSKY2012-09-171-2/+2
| * | | Documentation: indent-with-non-tab uses "equivalent tabs" not 8Wesley J. Landaker2012-09-171-2/+3
| * | | completion: add --no-edit to git-commitYacine Belkadi2012-09-161-1/+2
* | | | Merge branch 'mh/fetch-filter-refs'Junio C Hamano2012-09-176-126/+134
|\ \ \ \
| * | | | test-string-list.c: Fix some sparse warningsRamsay Jones2012-09-151-4/+4
| * | | | fetch-pack: eliminate spurious error messagesMichael Haggerty2012-09-122-7/+7
| * | | | cmd_fetch_pack(): simplify computation of return valueMichael Haggerty2012-09-121-11/+10
| * | | | fetch-pack: report missing refs even if no existing refs were receivedMichael Haggerty2012-09-122-2/+2
| * | | | cmd_fetch_pack(): return early if finish_connect() failsMichael Haggerty2012-09-121-3/+3
| * | | | filter_refs(): simplify logicMichael Haggerty2012-09-121-19/+18
| * | | | filter_refs(): build refs list as we goMichael Haggerty2012-09-121-27/+4
| * | | | filter_refs(): delete matched refs from sought listMichael Haggerty2012-09-123-15/+25
| * | | | fetch_pack(): update sought->nr to reflect number of unique entriesMichael Haggerty2012-09-122-15/+2
| * | | | filter_refs(): do not check the same sought_pos twiceMichael Haggerty2012-09-121-1/+1
| * | | | Change fetch_pack() and friends to take string_list argumentsMichael Haggerty2012-09-123-60/+51
| * | | | fetch_pack(): reindent function decl and defnMichael Haggerty2012-09-122-10/+10
| * | | | Rename static function fetch_pack() to http_fetch_pack()Michael Haggerty2012-09-121-2/+2
| * | | | t5500: add tests of fetch-pack --all --depth=N $URL $REFMichael Haggerty2012-09-121-0/+15
| * | | | t5500: add tests of error output for missing refsMichael Haggerty2012-09-121-0/+30
* | | | | Merge branch 'nd/maint-diffstat-summary'Junio C Hamano2012-09-171-6/+4
|\ \ \ \ \
| * | | | | Revert diffstat back to EnglishNguyễn Thái Ngọc Duy2012-09-141-6/+4
* | | | | | 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
View Lorry Controller Status