summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | git p4 doc: use two-line style for options with multiple spellingspw/git-p4Pete Wyckoff2014-01-221-2/+4
| * | | | | | | | git p4 test: examine behavior with locked (+l) filesPete Wyckoff2014-01-221-0/+145
| * | | | | | | | git p4: fix an error message when "p4 where" failsPete Wyckoff2014-01-221-1/+1
| * | | | | | | | git p4: handle files with wildcards when doing RCS scrubbingPete Wyckoff2014-01-222-2/+25
| * | | | | | | | git p4 test: do not pollute /tmpPete Wyckoff2014-01-223-4/+12
| * | | | | | | | git p4 test: run as user "author"Pete Wyckoff2014-01-222-25/+28
| * | | | | | | | git p4 test: is_cli_file_writeable succeedsPete Wyckoff2014-01-221-1/+1
| * | | | | | | | git p4 test: explicitly check p4 wildcard deletePete Wyckoff2014-01-221-0/+27
| * | | | | | | | git p4: work around p4 bug that causes empty symlinksPete Wyckoff2014-01-222-1/+74
| * | | | | | | | git p4 test: ensure p4 symlink parsing worksPete Wyckoff2014-01-211-0/+17
| * | | | | | | | git p4 test: wildcards are supportedPete Wyckoff2014-01-211-8/+8
* | | | | | | | | Merge branch 'ss/safe-create-leading-dir-with-slash'Junio C Hamano2014-01-271-4/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | safe_create_leading_directories(): on Windows, \ can separate path componentsss/safe-create-leading-dir-with-slashMichael Haggerty2014-01-221-4/+8
* | | | | | | | | | Merge branch 'mh/safe-create-leading-directories'Junio C Hamano2014-01-276-67/+155
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | rename_tmp_log(): on SCLD_VANISHED, retrymh/safe-create-leading-directoriesMichael Haggerty2014-01-211-1/+8
| * | | | | | | | | rename_tmp_log(): limit the number of remote_empty_directories() attemptsMichael Haggerty2014-01-211-2/+2
| * | | | | | | | | rename_tmp_log(): handle a possible mkdir/rmdir raceMichael Haggerty2014-01-211-1/+10
| * | | | | | | | | rename_ref(): extract function rename_tmp_log()Michael Haggerty2014-01-211-22/+30
| * | | | | | | | | remove_dir_recurse(): handle disappearing files and directoriesMichael Haggerty2014-01-211-6/+16
| * | | | | | | | | remove_dir_recurse(): tighten condition for removing unreadable dirMichael Haggerty2014-01-211-2/+5
| * | | | | | | | | lock_ref_sha1_basic(): if locking fails with ENOENT, retryMichael Haggerty2014-01-211-1/+12
| * | | | | | | | | lock_ref_sha1_basic(): on SCLD_VANISHED, retryMichael Haggerty2014-01-211-1/+10
| * | | | | | | | | safe_create_leading_directories(): add new error value SCLD_VANISHEDMichael Haggerty2014-01-062-1/+20
| * | | | | | | | | cmd_init_db(): when creating directories, handle errors conservativelyMichael Haggerty2014-01-061-3/+4
| * | | | | | | | | safe_create_leading_directories(): introduce enum for return valuesMichael Haggerty2014-01-064-13/+26
| * | | | | | | | | safe_create_leading_directories(): always restore slash at end of loopMichael Haggerty2014-01-061-13/+9
| * | | | | | | | | safe_create_leading_directories(): split on first of multiple slashesMichael Haggerty2014-01-061-2/+3
| * | | | | | | | | safe_create_leading_directories(): rename local variableMichael Haggerty2014-01-061-5/+5
| * | | | | | | | | safe_create_leading_directories(): add explicit "slash" pointerMichael Haggerty2014-01-061-9/+11
| * | | | | | | | | safe_create_leading_directories(): reduce scope of local variableMichael Haggerty2014-01-061-1/+2
| * | | | | | | | | safe_create_leading_directories(): fix format of "if" chainingMichael Haggerty2014-01-061-4/+2
* | | | | | | | | | Merge branch 'tr/nth-previous-is-a-commit'Junio C Hamano2014-01-272-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation: @{-N} can refer to a committr/nth-previous-is-a-commitThomas Rast2014-01-212-3/+3
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'tr/gitk-doc-range-trace'Junio C Hamano2014-01-271-0/+16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation/gitk: document -L optiontr/gitk-doc-range-traceThomas Rast2014-01-211-0/+16
* | | | | | | | | | | Merge branch 'jk/mark-edges-uninteresting'Junio C Hamano2014-01-272-9/+23
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | list-objects: only look at cmdline trees with edge_hintjk/mark-edges-uninterestingJeff King2014-01-211-9/+11
| * | | | | | | | | | | t/perf: time rev-list with UNINTERESTING commitsJeff King2014-01-211-0/+12
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/diff-filespec-cleanup'Junio C Hamano2014-01-272-7/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | diff_filespec: use only 2 bits for is_binary flagJeff King2014-01-171-1/+1
| * | | | | | | | | | | diff_filespec: reorder is_binary fieldJeff King2014-01-171-1/+1
| * | | | | | | | | | | diff_filespec: drop xfrm_flags fieldJeff King2014-01-172-3/+2
| * | | | | | | | | | | diff_filespec: drop funcname_pattern_ident fieldJeff King2014-01-171-1/+0
| * | | | | | | | | | | diff_filespec: reorder dirty_submodule macro definitionsJeff King2014-01-171-1/+1
* | | | | | | | | | | | Merge branch 'ef/mingw-write'Junio C Hamano2014-01-275-25/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | mingw: remove mingw_writeef/mingw-writeErik Faye-Lund2014-01-172-20/+0
| * | | | | | | | | | | | prefer xwrite instead of writeErik Faye-Lund2014-01-173-5/+4
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'rk/send-email-ssl-cert'Junio C Hamano2014-01-271-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | send-email: /etc/ssl/certs/ directory may not be usable as ca_pathrk/send-email-ssl-certRuben Kerkhof2014-01-161-1/+2
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'jn/ignore-doc'Junio C Hamano2014-01-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \