summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pw/p4-submit-conflicts'Junio C Hamano2012-09-187-107/+709
|\
| * git-p4: add submit --conflict option and config varaiablePete Wyckoff2012-09-163-5/+105
| * git p4: add submit --prepare-p4-only optionPete Wyckoff2012-09-163-0/+77
| * git p4: add submit --dry-run optionPete Wyckoff2012-09-163-13/+75
| * git p4: accept -v for --verbosePete Wyckoff2012-09-162-2/+2
| * git p4: revert deleted files after submit cancelPete Wyckoff2012-09-162-0/+121
| * git p4: rearrange submit template constructionPete Wyckoff2012-09-161-8/+21
| * git p4: test clean-up after failed submit, fix added filesPete Wyckoff2012-09-162-2/+132
| * git p4: standardize submit cancel due to unchanged templatePete Wyckoff2012-09-162-2/+4
| * git p4: move conflict prompt into run, add [q]uit inputPete Wyckoff2012-09-162-16/+56
| * git p4: remove submit failure options [a]pply and [w]ritePete Wyckoff2012-09-161-18/+2
| * git p4: gracefully fail if some commits could not be appliedPete Wyckoff2012-09-163-56/+128
| * git p4 test: remove bash-ism of combined export/assignmentPete Wyckoff2012-09-161-3/+4
* | Merge branch 'mv/cherry-pick-s'Junio C Hamano2012-09-186-65/+144
|\ \
| * | cherry-pick: don't forget -s on failureMiklos Vajna2012-09-146-65/+144
* | | Merge branch 'nd/fetch-status-alignment'Junio C Hamano2012-09-184-10/+26
|\ \ \
| * | | fetch: align per-ref summary report in UTF-8 localesNguyễn Thái Ngọc Duy2012-09-144-10/+26
* | | | 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
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
View Lorry Controller Status