summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* t9903: add extra tests for bash.showDirtyStateMartin Erik Werner2013-02-131-1/+37
* t9903: add tests for bash.showUntrackedFilesMartin Erik Werner2013-02-131-0/+40
* shell prompt: add bash.showUntrackedFiles optionMartin Erik Werner2013-02-131-3/+8
* Merge branch 'maint'Junio C Hamano2013-02-123-8/+8
|\
| * Replace filepattern with pathspec for consistencyMatthieu Moy2013-02-123-8/+8
* | Update draft release notes to 1.8.2Junio C Hamano2013-02-111-0/+25
* | Merge branch 'maint'Junio C Hamano2013-02-111-16/+10
|\|
| * user-manual: Rewrite git-gc section for automatic packingW. Trevor King2013-02-111-12/+6
| * user-manual: Fix 'you - Git' -> 'you--Git' typoW. Trevor King2013-02-111-1/+1
| * user-manual: Fix 'http' -> 'HTTP' typosW. Trevor King2013-02-111-3/+3
| * user-manual: Fix 'both: so' -> 'both; so' typoW. Trevor King2013-02-101-1/+1
* | Merge branch 'sp/smart-http-content-type-check'Junio C Hamano2013-02-118-17/+59
|\ \
| * | http_request: reset "type" strbuf before addingJeff King2013-02-061-0/+1
| * | t5551: fix expected error outputJunio C Hamano2013-02-051-2/+1
| * | Verify Content-Type from smart HTTP serversShawn Pearce2013-02-048-17/+59
* | | Merge branch 'master' of git://github.com/git-l10n/git-poJunio C Hamano2013-02-096-4559/+4728
|\ \ \
| * | | l10n: de.po: translate "reset" as "neu setzen"Ralf Thielow2013-02-081-8/+8
| * | | l10n: de.po: translate "revision" consistently as "Revision"Ralf Thielow2013-02-081-9/+9
| * | | l10n: de.po: translate 11 new messagesRalf Thielow2013-02-081-650/+722
| * | | l10n: zh_CN.po: 800+ new translations on command usagesWang Sheng2013-02-082-2136/+2123
| * | | l10n: Update Swedish translation (1983t0f0u)Peter Krefting2013-01-271-563/+601
| * | | l10n: vi.po: updated Vietnamese translationTran Ngoc Quan2013-01-251-572/+610
| * | | Merge branch 'master' of git://github.com/ralfth/git-po-deJiang Xin2013-01-251-96/+109
| |\ \ \
| | * | | l10n: de.po: fix some minor issuesRalf Thielow2013-01-231-96/+109
| * | | | l10n: Update git.pot (11 new, 7 removed messages)Jiang Xin2013-01-251-558/+579
* | | | | Merge branch 'jc/combine-diff-many-parents'Junio C Hamano2013-02-092-14/+31
|\ \ \ \ \
| * | | | | t4038: add tests for "diff --cc --raw <trees>"John Keeping2013-02-051-0/+24
| * | | | | combine-diff: lift 32-way limit of combined diffJunio C Hamano2013-02-031-14/+7
* | | | | | Merge branch 'jk/apply-similaritly-parsing'Junio C Hamano2013-02-091-4/+6
|\ \ \ \ \ \
| * | | | | | builtin/apply: tighten (dis)similarity index parsingJohn Keeping2013-02-031-4/+6
| |/ / / / /
* | | | | | Merge branch 'mk/tcsh-complete-only-known-paths'Junio C Hamano2013-02-091-0/+12
|\ \ \ \ \ \
| * | | | | | completion: handle path completion and colon for tcsh scriptMarc Khouzam2013-02-041-0/+12
* | | | | | | Merge branch 'mp/complete-paths'Junio C Hamano2013-02-091-15/+240
|\| | | | | |
| * | | | | | git-completion.bash: add support for path completionManlio Perillo2013-01-111-15/+240
* | | | | | | Merge branch 'ct/autoconf-htmldir'Junio C Hamano2013-02-091-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Honor configure's htmldir switchChristoph J. Thompson2013-02-031-1/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Update draft release notes to 1.8.2Junio C Hamano2013-02-081-5/+15
* | | | | | | Sync with 1.8.1.3Junio C Hamano2013-02-082-1/+22
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Git 1.8.1.3v1.8.1.3Junio C Hamano2013-02-083-2/+23
| * | | | | | Merge branch 'mz/pick-unborn' into maintJunio C Hamano2013-02-0810-48/+44
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'nd/fix-perf-parameters-in-tests' into maintJunio C Hamano2013-02-081-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/do-not-let-random-file-interfere-with-completion-tests' into...Junio C Hamano2013-02-082-2/+34
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ft/transport-report-segv' into maintJunio C Hamano2013-02-081-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'sb/gpg-plug-fd-leak' into maintJunio C Hamano2013-02-081-1/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/fake-ancestor-with-non-blobs' into maintJunio C Hamano2013-02-083-17/+45
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/auto-depend-workaround-buggy-ccache' into maintJunio C Hamano2013-02-081-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'da/mergetool-docs'Junio C Hamano2013-02-075-72/+159
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | doc: generate a list of valid merge toolsDavid Aguilar2013-02-035-15/+36
| * | | | | | | | | | | | | | mergetool--lib: list user configured tools in '--tool-help'John Keeping2013-02-031-1/+40
| * | | | | | | | | | | | | | mergetool--lib: add functions for finding available toolsDavid Aguilar2013-02-031-36/+65