summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bc/git-p4-for-python-2.4'Junio C Hamano2013-02-013-11/+35
|\
| * INSTALL: git-p4 does not support Python 3Junio C Hamano2013-01-301-2/+3
| * git-p4.py: support Python 2.4Brandon Casey2013-01-263-9/+31
| * git-p4.py: support Python 2.5Brandon Casey2013-01-262-2/+3
* | Merge branch 'jn/do-not-drop-username-when-reading-from-etc-mailname'Junio C Hamano2013-02-011-1/+5
|\ \
| * | ident: do not drop username when reading from /etc/mailnameJonathan Nieder2013-01-251-1/+5
* | | Merge branch 'jk/cvsimport-does-not-work-with-cvsps3'Junio C Hamano2013-02-011-0/+6
|\ \ \
| * | | git-cvsimport.txt: cvsps-2 is deprecatedJohn Keeping2013-01-241-0/+6
* | | | Merge branch 'jc/do-not-let-random-file-interfere-with-completion-tests'Junio C Hamano2013-02-012-2/+34
|\ \ \ \
| * | | | t9902: protect test from stray build artifactsJunio C Hamano2013-01-242-2/+34
| |/ / /
* | | | Merge branch 'as/test-cleanup'Junio C Hamano2013-02-011-20/+21
|\ \ \ \
| * | | | t7102 (reset): don't hardcode SHA-1 in expected outputsAlexey Shumkin2013-01-241-20/+21
| |/ / /
* | | | Merge branch 'jc/no-git-config-in-clone'Junio C Hamano2013-02-011-9/+0
|\ \ \ \
| * | | | clone: do not export and unexport GIT_CONFIGJunio C Hamano2013-01-111-9/+0
* | | | | Merge branch 'nd/fetch-depth-is-broken'Junio C Hamano2013-02-018-12/+85
|\ \ \ \ \
| * | | | | fetch: elaborate --depth actionNguyễn Thái Ngọc Duy2013-01-111-1/+1
| * | | | | upload-pack: fix off-by-one depth calculation in shallow cloneNguyễn Thái Ngọc Duy2013-01-112-7/+26
| * | | | | fetch: add --unshallow for turning shallow repo into complete oneNguyễn Thái Ngọc Duy2013-01-117-4/+58
* | | | | | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2013-01-302-2/+16
|\ \ \ \ \ \
| * | | | | | gitk: Ignore gitk-wish buildproductChristian Couder2013-01-302-2/+16
* | | | | | | Merge branch 'rr/minimal-stat'Junio C Hamano2013-01-305-10/+28
|\ \ \ \ \ \ \
| * | | | | | | Enable minimal stat checkingRobin Rosenberg2013-01-225-10/+28
* | | | | | | | Merge branch 'nd/magic-pathspec-from-root'Junio C Hamano2013-01-303-3/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | grep: avoid accepting ambiguous revisionNguyễn Thái Ngọc Duy2013-01-211-0/+2
| * | | | | | | | Update :/abc ambiguity checkNguyễn Thái Ngọc Duy2013-01-212-3/+23
* | | | | | | | | Merge branch 'maint'Junio C Hamano2013-01-301-8/+7
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'tb/t0050-maint' into maintJunio C Hamano2013-01-301-35/+17
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'nd/fix-directory-attrs-off-by-one' into maintJunio C Hamano2013-01-291-20/+18
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ph/rebase-preserve-all-merges' into maintJunio C Hamano2013-01-291-1/+6
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | README: update stale and/or incorrect informationJunio C Hamano2013-01-291-8/+7
* | | | | | | | | | | | | Update draft release notes to 1.8.2Junio C Hamano2013-01-281-30/+12
* | | | | | | | | | | | | Sync with 1.8.1.2Junio C Hamano2013-01-281-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Git 1.8.1.2v1.8.1.2Junio C Hamano2013-01-282-1/+13
| * | | | | | | | | | | | Merge branch 'ss/help-htmlpath-config-doc' into maintJunio C Hamano2013-01-281-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/attr-debug-fix' into maintJunio C Hamano2013-01-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ds/completion-silence-in-tree-path-probe' into maintJunio C Hamano2013-01-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/maint-trim-vim-contrib' into maintJunio C Hamano2013-01-281-13/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pe/doc-email-env-is-trumped-by-config' into maintJunio C Hamano2013-01-281-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mk/complete-tcsh' into maintJunio C Hamano2013-01-281-12/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ap/status-ignored-in-ignored-directory' into maintJunio C Hamano2013-01-283-22/+225
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'er/stop-recommending-parsecvs' into maintJunio C Hamano2013-01-281-4/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/ceiling' into maintJunio C Hamano2013-01-2811-165/+202
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/t0050-maint'Junio C Hamano2013-01-281-35/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | t0050: Use TAB for indentationTorsten Bögershausen2013-01-211-33/+15
| * | | | | | | | | | | | | | | | | | | | t0050: honor CASE_INSENSITIVE_FS in add (with different case)Torsten Bögershausen2013-01-211-1/+1
| * | | | | | | | | | | | | | | | | | | | t0050: known breakage vanished in merge (case change)Torsten Bögershausen2013-01-211-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'dl/am-hg-locale'Junio C Hamano2013-01-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | am: invoke perl's strftime in C localeDmitry V. Levin2013-01-181-1/+1
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/help'Junio C Hamano2013-01-282-18/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | help: include <common-cmds.h> only in one fileJunio C Hamano2013-01-182-18/+17