summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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-18Doc: Improve shallow depth wordingLibravatar Philip Oakley1-2/+4
2012-09-18Documentation/git-filter-branch: Move note about effect of removing commitsLibravatar Andreas Schwab1-10/+9
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-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-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-15test-string-list.c: Fix some sparse warningsLibravatar Ramsay Jones1-4/+4
2012-09-14Draft release notes to 1.8.0Libravatar Junio C Hamano1-0/+7
2012-09-14Merge branch 'jc/ll-merge-binary-ours'Libravatar Junio C Hamano5-12/+41
2012-09-14Merge branch 'cn/branch-set-upstream-to'Libravatar Junio C Hamano1-1/+5
2012-09-14Merge branch 'sl/autoconf'Libravatar Junio C Hamano2-124/+84
2012-09-14Merge branch 'dg/run-command-child-cleanup'Libravatar Junio C Hamano1-6/+7
2012-09-14Merge branch 'jc/mailinfo-RE'Libravatar Junio C Hamano1-1/+3
2012-09-14Merge branch 'maint'Libravatar Junio C Hamano3-48/+117
2012-09-14Draft release notes to 1.7.12.1Libravatar Junio C Hamano1-47/+69
2012-09-14Merge branch 'sb/send-email-reconfirm-fix' into maintLibravatar Junio C Hamano1-2/+4
2012-09-14Merge branch 'jc/send-email-reconfirm' into maintLibravatar Junio C Hamano1-3/+13
2012-09-14Merge branch 'mz/cherry-pick-cmdline-order' into maintLibravatar Junio C Hamano8-11/+60
2012-09-14Sync with 1.7.11.7Libravatar Junio C Hamano13-14/+147
2012-09-14Git 1.7.11.7Libravatar Junio C Hamano4-3/+50
2012-09-14Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log' into maint-1.7.11Libravatar Junio C Hamano2-1/+13
2012-09-14Merge branch 'jc/maint-ident-missing-human-name' into maint-1.7.11Libravatar Junio C Hamano2-3/+20