summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/make-static'Junio C Hamano2012-09-181-3/+0
|\
| * sha1-array.c: mark a private file-scope symbol as staticJunio C Hamano2012-09-151-3/+0
* | Merge branch 'pw/p4-submit-conflicts'Junio C Hamano2012-09-181-1/+23
|\ \
| * | git-p4: add submit --conflict option and config varaiablePete Wyckoff2012-09-161-0/+11
| * | git p4: add submit --prepare-p4-only optionPete Wyckoff2012-09-161-0/+7
| * | git p4: add submit --dry-run optionPete Wyckoff2012-09-161-0/+4
| * | git p4: accept -v for --verbosePete Wyckoff2012-09-161-1/+1
* | | Sync with 1.7.12.1Junio C Hamano2012-09-185-14/+33
|\ \ \
| * | | Git 1.7.12.1v1.7.12.1Junio C Hamano2012-09-182-1/+13
| * | | 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
| * | | | 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-171-2/+3
|\ \ \ \ \ | |/ / / /
| * | | | Documentation: indent-with-non-tab uses "equivalent tabs" not 8Wesley J. Landaker2012-09-171-2/+3
* | | | | 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-171-5/+63
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | 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-121-0/+8
| * | | | | string_list: add a new function, string_list_remove_duplicates()Michael Haggerty2012-09-121-0/+9
| * | | | | string_list: add a new function, filter_string_list()Michael Haggerty2012-09-121-0/+11
| * | | | | string_list: add two new functions for splitting stringsMichael Haggerty2012-09-121-1/+21
| * | | | | string_list: add function string_list_append_nodup()Michael Haggerty2012-09-121-3/+14
* | | | | | Draft release notes to 1.8.0Junio C Hamano2012-09-141-0/+7
* | | | | | Merge branch 'jc/ll-merge-binary-ours'Junio C Hamano2012-09-142-2/+3
|\ \ \ \ \ \
| * | | | | | attr: "binary" attribute should choose built-in "binary" merge driverJunio C Hamano2012-09-081-1/+1
| * | | | | | merge: teach -Xours/-Xtheirs to binary ll-merge driverJunio C Hamano2012-09-081-1/+2
* | | | | | | 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 'mz/cherry-pick-cmdline-order' into maintJunio C Hamano2012-09-141-4/+8
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Sync with 1.7.11.7Junio C Hamano2012-09-144-2/+78
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Git 1.7.11.7v1.7.11.7maint-1.7.11Junio C Hamano2012-09-142-1/+48
| | * | | | | | 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 'sn/ls-remote-get-url-doc'Junio C Hamano2012-09-141-0/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ls-remote: document the '--get-url' optionStefan Naewe2012-09-071-0/+5
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Start merging the sixth batch for 1.8.0Junio C Hamano2012-09-121-33/+18
* | | | | | | | | Merge branch 'maint'Junio C Hamano2012-09-121-0/+26
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Further merging in preparation for 1.7.12.1Junio C Hamano2012-09-121-0/+26
| * | | | | | | | Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-122-3/+10
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11Junio C Hamano2012-09-121-0/+7
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'jc/maint-doc-checkout-b-always-takes-branch-name' into maint-1....Junio C Hamano2012-09-121-3/+3
| | |\ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ Merge branch 'jc/maint-checkout-fileglob-doc'Junio C Hamano2012-09-122-1/+30
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | gitcli: contrast wildcard given to shell and to gitJunio C Hamano2012-09-101-0/+17
| * | | | | | | | | | gitcli: formatting fixJunio C Hamano2012-09-101-1/+1
| * | | | | | | | | | Document file-glob for "git checkout -- '*.c'"Junio C Hamano2012-09-041-0/+12
* | | | | | | | | | | Merge branch 'nd/maint-remote-remove'Junio C Hamano2012-09-121-1/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | remote: prefer subcommand name 'remove' to 'rm'Nguyễn Thái Ngọc Duy2012-09-061-1/+2