Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'bc/git-p4-for-python-2.4' | Junio C Hamano | 2013-02-01 | 3 | -11/+35 |
|\ | |||||
| * | INSTALL: git-p4 does not support Python 3 | Junio C Hamano | 2013-01-30 | 1 | -2/+3 |
| * | git-p4.py: support Python 2.4 | Brandon Casey | 2013-01-26 | 3 | -9/+31 |
| * | git-p4.py: support Python 2.5 | Brandon Casey | 2013-01-26 | 2 | -2/+3 |
* | | Merge branch 'jn/do-not-drop-username-when-reading-from-etc-mailname' | Junio C Hamano | 2013-02-01 | 1 | -1/+5 |
|\ \ | |||||
| * | | ident: do not drop username when reading from /etc/mailname | Jonathan Nieder | 2013-01-25 | 1 | -1/+5 |
* | | | Merge branch 'jk/cvsimport-does-not-work-with-cvsps3' | Junio C Hamano | 2013-02-01 | 1 | -0/+6 |
|\ \ \ | |||||
| * | | | git-cvsimport.txt: cvsps-2 is deprecated | John Keeping | 2013-01-24 | 1 | -0/+6 |
* | | | | Merge branch 'jc/do-not-let-random-file-interfere-with-completion-tests' | Junio C Hamano | 2013-02-01 | 2 | -2/+34 |
|\ \ \ \ | |||||
| * | | | | t9902: protect test from stray build artifacts | Junio C Hamano | 2013-01-24 | 2 | -2/+34 |
| |/ / / | |||||
* | | | | Merge branch 'as/test-cleanup' | Junio C Hamano | 2013-02-01 | 1 | -20/+21 |
|\ \ \ \ | |||||
| * | | | | t7102 (reset): don't hardcode SHA-1 in expected outputs | Alexey Shumkin | 2013-01-24 | 1 | -20/+21 |
| |/ / / | |||||
* | | | | Merge branch 'jc/no-git-config-in-clone' | Junio C Hamano | 2013-02-01 | 1 | -9/+0 |
|\ \ \ \ | |||||
| * | | | | clone: do not export and unexport GIT_CONFIG | Junio C Hamano | 2013-01-11 | 1 | -9/+0 |
* | | | | | Merge branch 'nd/fetch-depth-is-broken' | Junio C Hamano | 2013-02-01 | 8 | -12/+85 |
|\ \ \ \ \ | |||||
| * | | | | | fetch: elaborate --depth action | Nguyễn Thái Ngọc Duy | 2013-01-11 | 1 | -1/+1 |
| * | | | | | upload-pack: fix off-by-one depth calculation in shallow clone | Nguyễn Thái Ngọc Duy | 2013-01-11 | 2 | -7/+26 |
| * | | | | | fetch: add --unshallow for turning shallow repo into complete one | Nguyễn Thái Ngọc Duy | 2013-01-11 | 7 | -4/+58 |
* | | | | | | Merge git://ozlabs.org/~paulus/gitk | Junio C Hamano | 2013-01-30 | 2 | -2/+16 |
|\ \ \ \ \ \ | |||||
| * | | | | | | gitk: Ignore gitk-wish buildproduct | Christian Couder | 2013-01-30 | 2 | -2/+16 |
* | | | | | | | Merge branch 'rr/minimal-stat' | Junio C Hamano | 2013-01-30 | 5 | -10/+28 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Enable minimal stat checking | Robin Rosenberg | 2013-01-22 | 5 | -10/+28 |
* | | | | | | | | Merge branch 'nd/magic-pathspec-from-root' | Junio C Hamano | 2013-01-30 | 3 | -3/+25 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | grep: avoid accepting ambiguous revision | Nguyễn Thái Ngọc Duy | 2013-01-21 | 1 | -0/+2 |
| * | | | | | | | | Update :/abc ambiguity check | Nguyễn Thái Ngọc Duy | 2013-01-21 | 2 | -3/+23 |
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2013-01-30 | 1 | -8/+7 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'tb/t0050-maint' into maint | Junio C Hamano | 2013-01-30 | 1 | -35/+17 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'nd/fix-directory-attrs-off-by-one' into maint | Junio C Hamano | 2013-01-29 | 1 | -20/+18 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'ph/rebase-preserve-all-merges' into maint | Junio C Hamano | 2013-01-29 | 1 | -1/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | README: update stale and/or incorrect information | Junio C Hamano | 2013-01-29 | 1 | -8/+7 |
* | | | | | | | | | | | | | Update draft release notes to 1.8.2 | Junio C Hamano | 2013-01-28 | 1 | -30/+12 |
* | | | | | | | | | | | | | Sync with 1.8.1.2 | Junio C Hamano | 2013-01-28 | 1 | -0/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Git 1.8.1.2v1.8.1.2 | Junio C Hamano | 2013-01-28 | 2 | -1/+13 |
| * | | | | | | | | | | | | Merge branch 'ss/help-htmlpath-config-doc' into maint | Junio C Hamano | 2013-01-28 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/attr-debug-fix' into maint | Junio C Hamano | 2013-01-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ds/completion-silence-in-tree-path-probe' into maint | Junio C Hamano | 2013-01-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/maint-trim-vim-contrib' into maint | Junio C Hamano | 2013-01-28 | 1 | -13/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pe/doc-email-env-is-trumped-by-config' into maint | Junio C Hamano | 2013-01-28 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mk/complete-tcsh' into maint | Junio C Hamano | 2013-01-28 | 1 | -12/+21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ap/status-ignored-in-ignored-directory' into maint | Junio C Hamano | 2013-01-28 | 3 | -22/+225 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'er/stop-recommending-parsecvs' into maint | Junio C Hamano | 2013-01-28 | 1 | -4/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/ceiling' into maint | Junio C Hamano | 2013-01-28 | 11 | -165/+202 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/t0050-maint' | Junio C Hamano | 2013-01-28 | 1 | -35/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | t0050: Use TAB for indentation | Torsten Bögershausen | 2013-01-21 | 1 | -33/+15 |
| * | | | | | | | | | | | | | | | | | | | | t0050: honor CASE_INSENSITIVE_FS in add (with different case) | Torsten Bögershausen | 2013-01-21 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | t0050: known breakage vanished in merge (case change) | Torsten Bögershausen | 2013-01-21 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'dl/am-hg-locale' | Junio C Hamano | 2013-01-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | am: invoke perl's strftime in C locale | Dmitry V. Levin | 2013-01-18 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/help' | Junio C Hamano | 2013-01-28 | 2 | -18/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | help: include <common-cmds.h> only in one file | Junio C Hamano | 2013-01-18 | 2 | -18/+17 |