summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2012-09-18Merge branch 'jc/make-static'Libravatar Junio C Hamano26-96/+69
2012-09-18Merge branch 'pw/p4-submit-conflicts'Libravatar Junio C Hamano7-107/+709
2012-09-18Merge branch 'mv/cherry-pick-s'Libravatar Junio C Hamano6-65/+144
2012-09-18Merge branch 'nd/fetch-status-alignment'Libravatar Junio C Hamano4-10/+26
2012-09-18Sync with 1.7.12.1Libravatar Junio C Hamano5-14/+33
2012-09-18Git 1.7.12.1Libravatar Junio C Hamano3-2/+14
2012-09-18Merge branch 'er/doc-fast-import-done' into maintLibravatar Junio C Hamano1-1/+7
2012-09-18Merge branch 'jk/config-warn-on-inaccessible-paths' into maintLibravatar Junio C Hamano6-10/+34
2012-09-18t/test-lib: make sure Git has already been builtLibravatar Ramkumar Ramachandra2-10/+9
2012-09-18Doc: Improve shallow depth wordingLibravatar Philip Oakley1-2/+4
2012-09-18rebase -i: fix misleading error message after 'exec no-such' instructionLibravatar Johannes Sixt2-0/+15
2012-09-18Documentation/git-filter-branch: Move note about effect of removing commitsLibravatar Andreas Schwab1-10/+9
2012-09-18string_list API: document what "sorted" meansLibravatar Michael Haggerty1-3/+4
2012-09-17MALLOC_CHECK: various clean-upsLibravatar Junio C Hamano2-6/+21
2012-09-17rebase -i: Add tests for "--edit-todo"Libravatar Andrew Wong1-0/+18
2012-09-17rebase -i: Teach "--edit-todo" actionLibravatar Andrew Wong3-3/+32
2012-09-17rebase -i: Refactor help messages for todo fileLibravatar Andrew Wong1-11/+20
2012-09-17rebase usage: subcommands can not be combined with -iLibravatar Martin von Zweigbergk1-1/+1
2012-09-17The seventh batch for 1.8.0Libravatar Junio C Hamano1-0/+29
2012-09-17Merge branch 'maint'Libravatar Junio C Hamano5-8/+11
2012-09-17Merge branch 'mh/fetch-filter-refs'Libravatar Junio C Hamano6-126/+134
2012-09-17Merge branch 'nd/maint-diffstat-summary'Libravatar Junio C Hamano1-6/+4
2012-09-17Merge branch 'jk/config-warn-on-inaccessible-paths'Libravatar Junio C Hamano1-1/+1
2012-09-17Merge branch 'jw/doc-commit-title'Libravatar Junio C Hamano7-22/+31
2012-09-17Merge branch 'mh/string-list'Libravatar Junio C Hamano7-10/+502
2012-09-17Merge branch 'jc/maint-blame-no-such-path'Libravatar Junio C Hamano2-17/+74
2012-09-17make poll() work on platforms that can't recv() on a non-socketLibravatar Joachim Schmitz1-0/+4
2012-09-17poll() exits too early with EFAULT if 1st arg is NULLLibravatar Joachim Schmitz1-1/+1
2012-09-17fix some win32 specific dependencies in poll.cLibravatar Joachim Schmitz1-2/+6
2012-09-17make poll available for other platforms lacking itLibravatar Joachim Schmitz3-5/+15
2012-09-17mailinfo: do not concatenate charset= attribute values from mime headersLibravatar Junio C Hamano6-4/+32
2012-09-17t/perf: add "trash directory" to .gitignoreLibravatar Ramkumar Ramachandra1-2/+3
2012-09-17Add missing -z to git check-attr usage text for consistency with man pageLibravatar Adam Spiers1-1/+1
2012-09-17git-jump: ignore (custom) prefix in diff modeLibravatar Mischa POSLAWSKY1-2/+2
2012-09-17Documentation: indent-with-non-tab uses "equivalent tabs" not 8Libravatar Wesley J. Landaker1-2/+3
2012-09-16completion: add --no-edit to git-commitLibravatar Yacine Belkadi1-1/+2
2012-09-16Add userdiff patterns for AdaLibravatar Adrian Johnson7-1/+66
2012-09-16git-p4: add submit --conflict option and config varaiableLibravatar Pete Wyckoff3-5/+105
2012-09-16git p4: add submit --prepare-p4-only optionLibravatar Pete Wyckoff3-0/+77
2012-09-16git p4: add submit --dry-run optionLibravatar Pete Wyckoff3-13/+75
2012-09-16git p4: accept -v for --verboseLibravatar Pete Wyckoff2-2/+2
2012-09-16git p4: revert deleted files after submit cancelLibravatar Pete Wyckoff2-0/+121
2012-09-16git p4: rearrange submit template constructionLibravatar Pete Wyckoff1-8/+21
2012-09-16git p4: test clean-up after failed submit, fix added filesLibravatar Pete Wyckoff2-2/+132
2012-09-16git p4: standardize submit cancel due to unchanged templateLibravatar Pete Wyckoff2-2/+4
2012-09-16git p4: move conflict prompt into run, add [q]uit inputLibravatar Pete Wyckoff2-16/+56
2012-09-16git p4: remove submit failure options [a]pply and [w]riteLibravatar Pete Wyckoff1-18/+2
2012-09-16git p4: gracefully fail if some commits could not be appliedLibravatar Pete Wyckoff3-56/+128
2012-09-16git p4 test: remove bash-ism of combined export/assignmentLibravatar Pete Wyckoff1-3/+4
2012-09-15t7810-grep: test --all-match with multiple --grep and --author optionsLibravatar Michael J Gruber1-0/+20