summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | git p4: avoid shell when invoking git config --get-allPete Wyckoff2013-01-261-1/+2
| * | | | | | | | | | | | | | | | | | | git p4: avoid shell when invoking git rev-listPete Wyckoff2013-01-261-2/+3
| * | | | | | | | | | | | | | | | | | | git p4: avoid shell when mapping usersPete Wyckoff2013-01-261-1/+2
| * | | | | | | | | | | | | | | | | | | git p4: disable read-only attribute before deletingPete Wyckoff2013-01-261-0/+10
| * | | | | | | | | | | | | | | | | | | git p4 test: use test_chmod for cygwinPete Wyckoff2013-01-261-4/+7
| * | | | | | | | | | | | | | | | | | | git p4: cygwin p4 client does not mark read-onlyPete Wyckoff2013-01-263-4/+27
| * | | | | | | | | | | | | | | | | | | git p4 test: avoid wildcard * in windowsPete Wyckoff2013-01-262-10/+37
| * | | | | | | | | | | | | | | | | | | git p4 test: use LineEnd unix in windows tests tooPete Wyckoff2013-01-261-0/+1
| * | | | | | | | | | | | | | | | | | | git p4 test: newline handlingPete Wyckoff2013-01-261-0/+117
| * | | | | | | | | | | | | | | | | | | git p4: scrub crlf for utf16 files on windowsPete Wyckoff2013-01-261-1/+23
| * | | | | | | | | | | | | | | | | | | git p4: remove unreachable windows \r\n conversion codePete Wyckoff2013-01-261-9/+0
| * | | | | | | | | | | | | | | | | | | git p4 test: translate windows paths for cygwinPete Wyckoff2013-01-263-3/+26
| * | | | | | | | | | | | | | | | | | | git p4 test: start p4d inside its db dirPete Wyckoff2013-01-261-2/+5
| * | | | | | | | | | | | | | | | | | | git p4 test: use client_view in t9806Pete Wyckoff2013-01-262-30/+23
| * | | | | | | | | | | | | | | | | | | git p4 test: avoid loop in client_viewPete Wyckoff2013-01-262-4/+2
| * | | | | | | | | | | | | | | | | | | git p4 test: use client_view to build the initial clientPete Wyckoff2013-01-261-9/+2
| * | | | | | | | | | | | | | | | | | | git p4: generate better error message for bad depot pathPete Wyckoff2013-01-262-0/+6
| * | | | | | | | | | | | | | | | | | | git p4: remove unused importsPete Wyckoff2013-01-261-5/+9
| * | | | | | | | | | | | | | | | | | | git p4: temp branch name should use / even on windowsPete Wyckoff2013-01-261-1/+1
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/read-commit-buffer-data-after-free'Junio C Hamano2013-02-045-53/+85
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | logmsg_reencode: lazily load missing commit buffersJeff King2013-01-263-21/+57
| * | | | | | | | | | | | | | | | | | | | logmsg_reencode: never return NULLJeff King2013-01-264-33/+29
| * | | | | | | | | | | | | | | | | | | | commit: drop useless xstrdup of commit messageJeff King2013-01-261-1/+1
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | 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