summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/maint-log-grep-all-match'Junio C Hamano2012-09-186-23/+215
|\
| * t7810-grep: test --all-match with multiple --grep and --author optionsMichael J Gruber2012-09-151-0/+20
| * t7810-grep: test interaction of multiple --grep and --author optionsMichael J Gruber2012-09-151-16/+22
| * t7810-grep: test multiple --author with --all-matchMichael J Gruber2012-09-151-0/+8
| * t7810-grep: test multiple --grep with and without --all-matchMichael J Gruber2012-09-151-0/+16
| * t7810-grep: bring log --grep tests in common formMichael J Gruber2012-09-151-6/+18
| * grep.c: mark private file-scope symbols as staticJunio C Hamano2012-09-152-3/+6
| * log: document use of multiple commit limiting optionsJunio C Hamano2012-09-141-5/+18
| * log --grep/--author: honor --all-match honored for multiple --grep patternsJunio C Hamano2012-09-141-0/+19
| * grep: show --debug output only onceMichael J Gruber2012-09-141-0/+1
| * grep: teach --debug option to dump the parse treeJunio C Hamano2012-09-144-2/+96
* | Merge branch 'jc/make-static'Junio C Hamano2012-09-1826-96/+69
|\ \
| * | sequencer.c: mark a private file-scope symbol as staticJunio C Hamano2012-09-152-4/+1
| * | ident.c: mark private file-scope symbols as staticJunio C Hamano2012-09-152-4/+2
| * | trace.c: mark a private file-scope symbol as staticJunio C Hamano2012-09-152-2/+1
| * | wt-status.c: mark a private file-scope symbol as staticJunio C Hamano2012-09-152-4/+2
| * | read-cache.c: mark a private file-scope symbol as staticJunio C Hamano2012-09-152-2/+1
| * | strbuf.c: mark a private file-scope symbol as staticJunio C Hamano2012-09-152-15/+2
| * | sha1-array.c: mark a private file-scope symbol as staticJunio C Hamano2012-09-153-5/+1
| * | symlinks.c: mark private file-scope symbols as staticJunio C Hamano2012-09-152-4/+5
| * | notes.c: mark a private file-scope symbol as staticJunio C Hamano2012-09-152-16/+12
| * | rerere.c: mark private file-scope symbols as staticJunio C Hamano2012-09-152-2/+1
| * | graph.c: mark private file-scope symbols as staticJunio C Hamano2012-09-152-29/+30
| * | diff.c: mark a private file-scope symbol as staticJunio C Hamano2012-09-152-2/+1
| * | commit.c: mark a file-scope private symbol as staticJunio C Hamano2012-09-152-3/+5
| * | builtin/notes.c: mark file-scope private symbols as staticJunio C Hamano2012-09-152-4/+5
* | | 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
View Lorry Controller Status