summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mm/add-u-A-sans-pathspec'Junio C Hamano2013-02-042-4/+47
|\
| * add: warn when -u or -A is used without pathspecMatthieu Moy2013-01-282-4/+47
* | Merge branch 'jc/push-reject-reasons'Junio C Hamano2013-02-0411-30/+107
|\ \
| * | push: finishing touches to explain REJECT_ALREADY_EXISTS betterJunio C Hamano2013-01-241-2/+1
| * | push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCEJunio C Hamano2013-01-2411-4/+93
| * | push: further simplify the logic to assign rejection reasonJunio C Hamano2013-01-241-16/+11
| * | push: further clean up fields of "struct ref"Junio C Hamano2013-01-243-14/+8
* | | Merge branch 'jk/config-parsing-cleanup'Junio C Hamano2013-02-0410-99/+117
|\ \ \
| * | | reflog: use parse_config_key in config callbackJeff King2013-01-231-6/+7
| * | | help: use parse_config_key for man configJeff King2013-01-231-7/+7
| * | | submodule: simplify memory handling in config parsingJeff King2013-01-231-16/+14
| * | | submodule: use parse_config_key when parsing configJeff King2013-01-231-9/+10
| * | | userdiff: drop parse_driver functionJeff King2013-01-231-29/+21
| * | | convert some config callbacks to parse_config_keyJeff King2013-01-233-28/+13
| * | | archive-tar: use parse_config_key when parsing configJeff King2013-01-232-10/+3
| * | | config: add helper function for parsing key namesJeff King2013-01-232-0/+48
* | | | Merge branch 'jc/custom-comment-char'Junio C Hamano2013-02-0420-78/+284
|\ \ \ \
| * | | | Allow custom "comment char"Junio C Hamano2013-01-1620-78/+284
* | | | | Update draft release notes to 1.8.2Junio C Hamano2013-02-011-1/+41
* | | | | Merge branch 'nd/edit-branch-desc-while-detached'Junio C Hamano2013-02-011-4/+4
|\ \ \ \ \
| * | | | | branch: no detached HEAD check when editing another branch's descriptionNguyễn Thái Ngọc Duy2013-01-301-4/+4
* | | | | | Merge branch 'jk/gc-auto-after-fetch'Junio C Hamano2013-02-012-0/+8
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/maint-gc-auto-after-fetch' into jk/gc-auto-after-fetchJunio C Hamano2013-01-262-0/+8
| |\ \ \ \ \ \
| | * | | | | | fetch-pack: avoid repeatedly re-scanning pack directoryJeff King2013-01-261-0/+3
| | * | | | | | fetch: run gc --auto after fetchingJeff King2013-01-261-0/+5
| | |/ / / / /
* | | | | | | 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