summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* builtin/log.c: minor reformatjc/log-p-ccJunio C Hamano2015-08-251-4/+2
* log: show merge commit when --cc is givenJunio C Hamano2015-08-201-0/+4
* log: when --cc is given, default to -p unless told otherwiseJunio C Hamano2015-08-201-0/+4
* log: rename "tweak" helpersJunio C Hamano2015-08-201-5/+6
* Sync with maintJunio C Hamano2015-08-191-0/+49
|\
| * Start preparing for 2.5.1Junio C Hamano2015-08-192-1/+50
| * Merge branch 'ta/docfix-index-format-tech' into maintJunio C Hamano2015-08-191-1/+1
| |\
| * \ Merge branch 'sb/parse-options-codeformat' into maintJunio C Hamano2015-08-191-1/+1
| |\ \
| * \ \ Merge branch 'sb/remove-unused-var-from-builtin-add' into maintJunio C Hamano2015-08-191-2/+0
| |\ \ \
| * \ \ \ Merge branch 'kn/tag-doc-fix' into maintJunio C Hamano2015-08-191-1/+0
| |\ \ \ \
| * \ \ \ \ Merge branch 'es/doc-clean-outdated-tools' into maintJunio C Hamano2015-08-192-117/+9
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'nd/export-worktree' into maintJunio C Hamano2015-08-192-0/+19
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'mh/fast-import-optimize-current-from' into maintJunio C Hamano2015-08-191-12/+17
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ib/scripted-parse-opt-better-hint-string' into maintJunio C Hamano2015-08-193-68/+92
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'se/doc-checkout-ours-theirs' into maintJunio C Hamano2015-08-191-0/+15
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'cb/uname-in-untracked' into maintJunio C Hamano2015-08-191-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'as/sparse-checkout-removal' into maintJunio C Hamano2015-08-192-0/+56
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'db/send-pack-user-signingkey' into maintJunio C Hamano2015-08-191-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jx/do-not-crash-receive-pack-wo-head' into maintJunio C Hamano2015-08-191-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'da/subtree-date-confusion' into maintJunio C Hamano2015-08-192-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | Fourth batch for 2.6Junio C Hamano2015-08-191-1/+34
* | | | | | | | | | | | | | | | Merge branch 'tb/complete-rebase-i-edit-todo'Junio C Hamano2015-08-191-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | completion: offer '--edit-todo' during interactive rebasetb/complete-rebase-i-edit-todoThomas Braun2015-08-051-1/+4
* | | | | | | | | | | | | | | | | Merge branch 'jk/git-path'Junio C Hamano2015-08-1930-363/+465
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | memoize common git-path "constant" filesjk/git-pathJeff King2015-08-1017-119/+151
| * | | | | | | | | | | | | | | | | get_repo_path: refactor path-allocationJeff King2015-08-101-14/+29
| * | | | | | | | | | | | | | | | | find_hook: keep our own static bufferJeff King2015-08-102-4/+11
| * | | | | | | | | | | | | | | | | refs.c: remove_empty_directories can take a strbufJeff King2015-08-101-19/+15
| * | | | | | | | | | | | | | | | | refs.c: avoid git_path assignment in lock_ref_sha1_basicJeff King2015-08-101-13/+19
| * | | | | | | | | | | | | | | | | refs.c: avoid repeated git_path calls in rename_tmp_logJeff King2015-08-101-7/+14
| * | | | | | | | | | | | | | | | | refs.c: simplify strbufs in reflog setup and writingJeff King2015-08-101-23/+15
| * | | | | | | | | | | | | | | | | path.c: drop git_path_submoduleJeff King2015-08-102-13/+2
| * | | | | | | | | | | | | | | | | refs.c: remove extra git_path calls from read_loose_refsJeff King2015-08-101-10/+13
| * | | | | | | | | | | | | | | | | remote.c: drop extraneous local variable from migrate_fileJeff King2015-08-101-5/+2
| * | | | | | | | | | | | | | | | | prefer mkpathdup to mkpath in assignmentsJeff King2015-08-102-13/+17
| * | | | | | | | | | | | | | | | | prefer git_pathdup to git_path in some possibly-dangerous casesJeff King2015-08-106-11/+21
| * | | | | | | | | | | | | | | | | add_to_alternates_file: don't add duplicate entriesJeff King2015-08-102-7/+45
| * | | | | | | | | | | | | | | | | t5700: modernize styleJeff King2015-08-101-112/+81
| * | | | | | | | | | | | | | | | | cache.h: complete set of git_path_submodule helpersJeff King2015-08-102-5/+35
| * | | | | | | | | | | | | | | | | cache.h: clarify documentation for git_path, et alJeff King2015-08-101-5/+12
* | | | | | | | | | | | | | | | | | Merge branch 'jc/finalize-temp-file'Junio C Hamano2015-08-195-15/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | sha1_file.c: rename move_temp_to_file() to finalize_object_file()jc/finalize-temp-fileJunio C Hamano2015-08-105-15/+12
* | | | | | | | | | | | | | | | | | | Merge branch 'ps/guess-repo-name-at-root'Junio C Hamano2015-08-192-19/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | clone: abort if no dir name could be guessedps/guess-repo-name-at-rootPatrick Steinhardt2015-08-101-0/+4
| * | | | | | | | | | | | | | | | | | | clone: do not use port number as dir namePatrick Steinhardt2015-08-102-7/+24
| * | | | | | | | | | | | | | | | | | | clone: do not include authentication data in guessed dirPatrick Steinhardt2015-08-102-12/+33
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/guess-repo-name-regression-fix'Junio C Hamano2015-08-192-1/+108
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | clone: use computed length in guess_dir_namejk/guess-repo-name-regression-fixJeff King2015-08-102-7/+8
| * | | | | | | | | | | | | | | | | | | clone: add tests for output directoryJeff King2015-08-101-0/+106
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/negative-hiderefs'Junio C Hamano2015-08-193-22/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \