summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dt/refs-pseudo'Junio C Hamano2015-08-255-56/+163
|\
| * pseudoref: check return values from read_ref()dt/refs-pseudoDavid Turner2015-08-111-2/+5
| * sequencer: replace write_cherry_pick_head with update_refDavid Turner2015-07-311-19/+4
| * bisect: use update_refDavid Turner2015-07-311-29/+8
| * pseudorefs: create and use pseudoref update and delete functionsDavid Turner2015-07-311-8/+93
| * refs: add ref_type functionDavid Turner2015-07-312-0/+34
| * refs: introduce pseudoref and per-worktree ref conceptsDavid Turner2015-07-311-0/+21
* | Merge branch 'dt/notes-multiple'Junio C Hamano2015-08-254-12/+120
|\ \
| * | notes: handle multiple worktreesdt/notes-multipleDavid Turner2015-08-112-0/+78
| * | worktrees: add find_shared_symrefDavid Turner2015-08-112-12/+42
* | | Merge branch 'nd/dwim-wildcards-as-pathspecs'Junio C Hamano2015-08-251-1/+1
|\ \ \
| * | | t2019: skip test requiring '*' in a file name non WindowsJohannes Sixt2015-08-111-1/+1
* | | | Merge branch 'jk/long-error-messages'Junio C Hamano2015-08-253-29/+21
|\ \ \ \
| * | | | vreportf: avoid intermediate bufferjk/long-error-messagesJeff King2015-08-111-3/+12
| * | | | vreportf: report to arbitrary filehandlesJeff King2015-08-113-29/+12
* | | | | Merge branch 'ee/clean-remove-dirs'Junio C Hamano2015-08-251-1/+1
|\ \ \ \ \
| * | | | | t7300-clean: require POSIXPERM for chmod 0 testee/clean-remove-dirsJohannes Sixt2015-08-111-1/+1
* | | | | | Merge branch 'jh/strbuf-read-use-read-in-full'Junio C Hamano2015-08-251-5/+5
|\ \ \ \ \ \
| * | | | | | strbuf_read(): skip unnecessary strbuf_grow() at eofjh/strbuf-read-use-read-in-fullJim Hill2015-08-101-5/+5
* | | | | | | 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
View Lorry Controller Status