Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/make-static' | Junio C Hamano | 2012-09-18 | 1 | -3/+0 |
|\ | |||||
| * | sha1-array.c: mark a private file-scope symbol as static | Junio C Hamano | 2012-09-15 | 1 | -3/+0 |
* | | Merge branch 'pw/p4-submit-conflicts' | Junio C Hamano | 2012-09-18 | 1 | -1/+23 |
|\ \ | |||||
| * | | git-p4: add submit --conflict option and config varaiable | Pete Wyckoff | 2012-09-16 | 1 | -0/+11 |
| * | | git p4: add submit --prepare-p4-only option | Pete Wyckoff | 2012-09-16 | 1 | -0/+7 |
| * | | git p4: add submit --dry-run option | Pete Wyckoff | 2012-09-16 | 1 | -0/+4 |
| * | | git p4: accept -v for --verbose | Pete Wyckoff | 2012-09-16 | 1 | -1/+1 |
* | | | Sync with 1.7.12.1 | Junio C Hamano | 2012-09-18 | 5 | -14/+33 |
|\ \ \ | |||||
| * | | | Git 1.7.12.1v1.7.12.1 | Junio C Hamano | 2012-09-18 | 2 | -1/+13 |
| * | | | Merge branch 'er/doc-fast-import-done' into maint | Junio C Hamano | 2012-09-18 | 1 | -1/+7 |
| |\ \ \ | |||||
| | * | | | fast-import: document the --done option | Eric S. Raymond | 2012-08-22 | 1 | -1/+7 |
| * | | | | Doc: Improve shallow depth wording | Philip Oakley | 2012-09-18 | 1 | -2/+4 |
| * | | | | Documentation/git-filter-branch: Move note about effect of removing commits | Andreas Schwab | 2012-09-18 | 1 | -10/+9 |
* | | | | | The seventh batch for 1.8.0 | Junio C Hamano | 2012-09-17 | 1 | -0/+29 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2012-09-17 | 1 | -2/+3 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Documentation: indent-with-non-tab uses "equivalent tabs" not 8 | Wesley J. Landaker | 2012-09-17 | 1 | -2/+3 |
* | | | | | Merge branch 'jw/doc-commit-title' | Junio C Hamano | 2012-09-17 | 7 | -22/+31 |
|\ \ \ \ \ | |||||
| * | | | | | Documentation: describe subject more precisely | Jeremy White | 2012-09-13 | 7 | -22/+31 |
* | | | | | | Merge branch 'mh/string-list' | Junio C Hamano | 2012-09-17 | 1 | -5/+63 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | api-string-list.txt: initialize the string_list the easy way | Michael Haggerty | 2012-09-12 | 1 | -2/+1 |
| * | | | | | string_list: add a function string_list_longest_prefix() | Michael Haggerty | 2012-09-12 | 1 | -0/+8 |
| * | | | | | string_list: add a new function, string_list_remove_duplicates() | Michael Haggerty | 2012-09-12 | 1 | -0/+9 |
| * | | | | | string_list: add a new function, filter_string_list() | Michael Haggerty | 2012-09-12 | 1 | -0/+11 |
| * | | | | | string_list: add two new functions for splitting strings | Michael Haggerty | 2012-09-12 | 1 | -1/+21 |
| * | | | | | string_list: add function string_list_append_nodup() | Michael Haggerty | 2012-09-12 | 1 | -3/+14 |
* | | | | | | Draft release notes to 1.8.0 | Junio C Hamano | 2012-09-14 | 1 | -0/+7 |
* | | | | | | Merge branch 'jc/ll-merge-binary-ours' | Junio C Hamano | 2012-09-14 | 2 | -2/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | attr: "binary" attribute should choose built-in "binary" merge driver | Junio C Hamano | 2012-09-08 | 1 | -1/+1 |
| * | | | | | | merge: teach -Xours/-Xtheirs to binary ll-merge driver | Junio C Hamano | 2012-09-08 | 1 | -1/+2 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-09-14 | 3 | -48/+117 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Draft release notes to 1.7.12.1 | Junio C Hamano | 2012-09-14 | 1 | -47/+69 |
| * | | | | | | Merge branch 'mz/cherry-pick-cmdline-order' into maint | Junio C Hamano | 2012-09-14 | 1 | -4/+8 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Sync with 1.7.11.7 | Junio C Hamano | 2012-09-14 | 4 | -2/+78 |
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| | * | | | | | | Git 1.7.11.7v1.7.11.7maint-1.7.11 | Junio C Hamano | 2012-09-14 | 2 | -1/+48 |
| | * | | | | | | Merge branch 'jc/maint-checkout-fileglob-doc' into maint-1.7.11 | Junio C Hamano | 2012-09-14 | 2 | -1/+30 |
| | |\ \ \ \ \ \ | |||||
* | | | | | | | | | The sixth batch for 1.8.0 | Junio C Hamano | 2012-09-14 | 1 | -0/+13 |
* | | | | | | | | | Merge branch 'sn/ls-remote-get-url-doc' | Junio C Hamano | 2012-09-14 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | ls-remote: document the '--get-url' option | Stefan Naewe | 2012-09-07 | 1 | -0/+5 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Start merging the sixth batch for 1.8.0 | Junio C Hamano | 2012-09-12 | 1 | -33/+18 |
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-09-12 | 1 | -0/+26 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Further merging in preparation for 1.7.12.1 | Junio C Hamano | 2012-09-12 | 1 | -0/+26 |
| * | | | | | | | | Merge branch 'maint-1.7.11' into maint | Junio C Hamano | 2012-09-12 | 2 | -3/+10 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11 | Junio C Hamano | 2012-09-12 | 1 | -0/+7 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'jc/maint-doc-checkout-b-always-takes-branch-name' into maint-1.... | Junio C Hamano | 2012-09-12 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ \ | |||||
* | | \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-checkout-fileglob-doc' | Junio C Hamano | 2012-09-12 | 2 | -1/+30 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | gitcli: contrast wildcard given to shell and to git | Junio C Hamano | 2012-09-10 | 1 | -0/+17 |
| * | | | | | | | | | | gitcli: formatting fix | Junio C Hamano | 2012-09-10 | 1 | -1/+1 |
| * | | | | | | | | | | Document file-glob for "git checkout -- '*.c'" | Junio C Hamano | 2012-09-04 | 1 | -0/+12 |
* | | | | | | | | | | | Merge branch 'nd/maint-remote-remove' | Junio C Hamano | 2012-09-12 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | remote: prefer subcommand name 'remove' to 'rm' | Nguyễn Thái Ngọc Duy | 2012-09-06 | 1 | -1/+2 |