summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mm/merge-rename-delete-message'Junio C Hamano2017-02-272-54/+86
|\
| * merge-recursive: make "CONFLICT (rename/delete)" message show both pathsmm/merge-rename-delete-messageMatt McCutchen2017-01-302-54/+86
* | Merge branch 'mh/ref-remove-empty-directory'Junio C Hamano2017-02-276-195/+351
|\ \
| * | files_transaction_commit(): clean up empty directoriesmh/ref-remove-empty-directoryMichael Haggerty2017-01-073-8/+64
| * | try_remove_empty_parents(): teach to remove parents of reflogs, tooMichael Haggerty2017-01-071-6/+18
| * | try_remove_empty_parents(): don't trash argument contentsMichael Haggerty2017-01-071-7/+9
| * | try_remove_empty_parents(): rename parameter "name" -> "refname"Michael Haggerty2017-01-071-4/+4
| * | delete_ref_loose(): inline functionMichael Haggerty2017-01-071-18/+7
| * | delete_ref_loose(): derive loose reference path from lockMichael Haggerty2017-01-071-4/+1
| * | log_ref_write_1(): inline functionMichael Haggerty2017-01-071-10/+3
| * | log_ref_setup(): manage the name of the reflog file internallyMichael Haggerty2017-01-071-35/+34
| * | log_ref_write_1(): don't depend on logfile argumentMichael Haggerty2017-01-071-4/+8
| * | log_ref_setup(): pass the open file descriptor back to the callerMichael Haggerty2017-01-071-17/+22
| * | log_ref_setup(): improve robustness against racesMichael Haggerty2017-01-071-23/+18
| * | log_ref_setup(): separate code for create vs non-createMichael Haggerty2017-01-071-20/+39
| * | log_ref_write(): inline functionMichael Haggerty2017-01-071-14/+10
| * | rename_tmp_log(): improve error reportingMichael Haggerty2017-01-071-3/+4
| * | rename_tmp_log(): use raceproof_create_file()Michael Haggerty2017-01-071-43/+30
| * | lock_ref_sha1_basic(): use raceproof_create_file()Michael Haggerty2017-01-071-26/+9
| * | lock_ref_sha1_basic(): inline constantMichael Haggerty2017-01-071-2/+1
| * | raceproof_create_file(): new functionMichael Haggerty2017-01-072-0/+111
| * | safe_create_leading_directories(): set errno on SCLD_EXISTSMichael Haggerty2017-01-072-3/+6
| * | safe_create_leading_directories_const(): preserve errnoMichael Haggerty2017-01-071-0/+4
| * | t5505: use "for-each-ref" to test for the non-existence of referencesMichael Haggerty2017-01-071-1/+1
| * | refname_is_safe(): correct docstringMichael Haggerty2017-01-071-5/+6
| * | files_rename_ref(): tidy up whitespaceMichael Haggerty2017-01-071-1/+1
* | | Merge branch 'jk/delta-chain-limit'Junio C Hamano2017-02-273-23/+207
|\ \ \
| * | | pack-objects: convert recursion to iteration in break_delta_chain()jk/delta-chain-limitJeff King2017-01-271-30/+99
| * | | pack-objects: enforce --depth limit in reused deltasJeff King2017-01-273-0/+115
| | |/ | |/|
* | | Merge branch 'jk/describe-omit-some-refs'Junio C Hamano2017-02-278-21/+187
|\ \ \
| * | | describe: teach describe negative pattern matchesJacob Keller2017-01-234-0/+40
| * | | describe: teach --match to accept multiple patternsJacob Keller2017-01-233-8/+46
| * | | name-rev: add support to exclude refs by pattern matchJacob Keller2017-01-233-1/+34
| * | | name-rev: extend --refs to accept multiple patternsJacob Keller2017-01-233-13/+63
| * | | doc: add documentation for OPT_STRING_LISTJacob Keller2017-01-191-0/+5
* | | | Git 2.12v2.12.0Junio C Hamano2017-02-243-1/+12
* | | | Merge branch 'ps/doc-gc-aggressive-depth-update'Junio C Hamano2017-02-241-1/+1
|\ \ \ \
| * | | | docs/git-gc: fix default value for `--aggressiveDepth`ps/doc-gc-aggressive-depth-updatePatrick Steinhardt2017-02-241-1/+1
* | | | | Merge branch 'bc/worktree-doc-fix-detached'Junio C Hamano2017-02-241-1/+1
|\ \ \ \ \
| * | | | | Documentation: correctly spell git worktree --detachbc/worktree-doc-fix-detachedbrian m. carlson2017-02-221-1/+1
* | | | | | Merge branch 'dr/doc-check-ref-format-normalize'Junio C Hamano2017-02-241-3/+3
|\ \ \ \ \ \
| * | | | | | git-check-ref-format: clarify documentation for --normalizedr/doc-check-ref-format-normalizeDamien Regad2017-02-211-3/+3
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'gp/document-dotfiles-in-templates-are-not-copied'Junio C Hamano2017-02-241-2/+2
|\ \ \ \ \ \
| * | | | | | init: document dotfiles exclusion on template copygp/document-dotfiles-in-templates-are-not-copiedGrégoire Paris2017-02-171-2/+2
| |/ / / / /
* | | | | | Merge branch 'rt/align-add-i-help-text'Junio C Hamano2017-02-241-1/+1
|\ \ \ \ \ \
| * | | | | | git add -i: replace \t with blanks in the help messagert/align-add-i-help-textRalf Thielow2017-02-221-1/+1
* | | | | | | Merge branch 'bc/blame-doc-fix'Junio C Hamano2017-02-241-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Documentation: use brackets for optional argumentsbc/blame-doc-fixbrian m. carlson2017-02-221-2/+2
| |/ / / / / /
* | | | | | | Merge tag 'l10n-2.12.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano2017-02-2411-16381/+30174
|\ \ \ \ \ \ \
| * | | | | | | l10n: zh_CN: for git v2.12.0 l10n round 2Jiang Xin2017-02-251-1446/+2761