Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | t9903: add extra tests for bash.showDirtyState | Martin Erik Werner | 2013-02-13 | 1 | -1/+37 |
* | t9903: add tests for bash.showUntrackedFiles | Martin Erik Werner | 2013-02-13 | 1 | -0/+40 |
* | shell prompt: add bash.showUntrackedFiles option | Martin Erik Werner | 2013-02-13 | 1 | -3/+8 |
* | Merge branch 'maint' | Junio C Hamano | 2013-02-12 | 3 | -8/+8 |
|\ | |||||
| * | Replace filepattern with pathspec for consistency | Matthieu Moy | 2013-02-12 | 3 | -8/+8 |
* | | Update draft release notes to 1.8.2 | Junio C Hamano | 2013-02-11 | 1 | -0/+25 |
* | | Merge branch 'maint' | Junio C Hamano | 2013-02-11 | 1 | -16/+10 |
|\| | |||||
| * | user-manual: Rewrite git-gc section for automatic packing | W. Trevor King | 2013-02-11 | 1 | -12/+6 |
| * | user-manual: Fix 'you - Git' -> 'you--Git' typo | W. Trevor King | 2013-02-11 | 1 | -1/+1 |
| * | user-manual: Fix 'http' -> 'HTTP' typos | W. Trevor King | 2013-02-11 | 1 | -3/+3 |
| * | user-manual: Fix 'both: so' -> 'both; so' typo | W. Trevor King | 2013-02-10 | 1 | -1/+1 |
* | | Merge branch 'sp/smart-http-content-type-check' | Junio C Hamano | 2013-02-11 | 8 | -17/+59 |
|\ \ | |||||
| * | | http_request: reset "type" strbuf before adding | Jeff King | 2013-02-06 | 1 | -0/+1 |
| * | | t5551: fix expected error output | Junio C Hamano | 2013-02-05 | 1 | -2/+1 |
| * | | Verify Content-Type from smart HTTP servers | Shawn Pearce | 2013-02-04 | 8 | -17/+59 |
* | | | Merge branch 'master' of git://github.com/git-l10n/git-po | Junio C Hamano | 2013-02-09 | 6 | -4559/+4728 |
|\ \ \ | |||||
| * | | | l10n: de.po: translate "reset" as "neu setzen" | Ralf Thielow | 2013-02-08 | 1 | -8/+8 |
| * | | | l10n: de.po: translate "revision" consistently as "Revision" | Ralf Thielow | 2013-02-08 | 1 | -9/+9 |
| * | | | l10n: de.po: translate 11 new messages | Ralf Thielow | 2013-02-08 | 1 | -650/+722 |
| * | | | l10n: zh_CN.po: 800+ new translations on command usages | Wang Sheng | 2013-02-08 | 2 | -2136/+2123 |
| * | | | l10n: Update Swedish translation (1983t0f0u) | Peter Krefting | 2013-01-27 | 1 | -563/+601 |
| * | | | l10n: vi.po: updated Vietnamese translation | Tran Ngoc Quan | 2013-01-25 | 1 | -572/+610 |
| * | | | Merge branch 'master' of git://github.com/ralfth/git-po-de | Jiang Xin | 2013-01-25 | 1 | -96/+109 |
| |\ \ \ | |||||
| | * | | | l10n: de.po: fix some minor issues | Ralf Thielow | 2013-01-23 | 1 | -96/+109 |
| * | | | | l10n: Update git.pot (11 new, 7 removed messages) | Jiang Xin | 2013-01-25 | 1 | -558/+579 |
* | | | | | Merge branch 'jc/combine-diff-many-parents' | Junio C Hamano | 2013-02-09 | 2 | -14/+31 |
|\ \ \ \ \ | |||||
| * | | | | | t4038: add tests for "diff --cc --raw <trees>" | John Keeping | 2013-02-05 | 1 | -0/+24 |
| * | | | | | combine-diff: lift 32-way limit of combined diff | Junio C Hamano | 2013-02-03 | 1 | -14/+7 |
* | | | | | | Merge branch 'jk/apply-similaritly-parsing' | Junio C Hamano | 2013-02-09 | 1 | -4/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | builtin/apply: tighten (dis)similarity index parsing | John Keeping | 2013-02-03 | 1 | -4/+6 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'mk/tcsh-complete-only-known-paths' | Junio C Hamano | 2013-02-09 | 1 | -0/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | completion: handle path completion and colon for tcsh script | Marc Khouzam | 2013-02-04 | 1 | -0/+12 |
* | | | | | | | Merge branch 'mp/complete-paths' | Junio C Hamano | 2013-02-09 | 1 | -15/+240 |
|\| | | | | | | |||||
| * | | | | | | git-completion.bash: add support for path completion | Manlio Perillo | 2013-01-11 | 1 | -15/+240 |
* | | | | | | | Merge branch 'ct/autoconf-htmldir' | Junio C Hamano | 2013-02-09 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Honor configure's htmldir switch | Christoph J. Thompson | 2013-02-03 | 1 | -1/+2 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Update draft release notes to 1.8.2 | Junio C Hamano | 2013-02-08 | 1 | -5/+15 |
* | | | | | | | Sync with 1.8.1.3 | Junio C Hamano | 2013-02-08 | 2 | -1/+22 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Git 1.8.1.3v1.8.1.3 | Junio C Hamano | 2013-02-08 | 3 | -2/+23 |
| * | | | | | | Merge branch 'mz/pick-unborn' into maint | Junio C Hamano | 2013-02-08 | 10 | -48/+44 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'nd/fix-perf-parameters-in-tests' into maint | Junio C Hamano | 2013-02-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jc/do-not-let-random-file-interfere-with-completion-tests' into... | Junio C Hamano | 2013-02-08 | 2 | -2/+34 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'ft/transport-report-segv' into maint | Junio C Hamano | 2013-02-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'sb/gpg-plug-fd-leak' into maint | Junio C Hamano | 2013-02-08 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/fake-ancestor-with-non-blobs' into maint | Junio C Hamano | 2013-02-08 | 3 | -17/+45 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/auto-depend-workaround-buggy-ccache' into maint | Junio C Hamano | 2013-02-08 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'da/mergetool-docs' | Junio C Hamano | 2013-02-07 | 5 | -72/+159 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | doc: generate a list of valid merge tools | David Aguilar | 2013-02-03 | 5 | -15/+36 |
| * | | | | | | | | | | | | | | mergetool--lib: list user configured tools in '--tool-help' | John Keeping | 2013-02-03 | 1 | -1/+40 |
| * | | | | | | | | | | | | | | mergetool--lib: add functions for finding available tools | David Aguilar | 2013-02-03 | 1 | -36/+65 |