summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge branch 'nd/worktree-add-lock'Junio C Hamano2017-04-263-5/+23
|\ \ \ \ \ \ \
| * | | | | | | worktree add: add --lock optionnd/worktree-add-lockNguyễn Thái Ngọc Duy2017-04-203-5/+23
* | | | | | | | Merge branch 'jk/update-links-in-docs'Junio C Hamano2017-04-266-14/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | docs/bisect-lk2009: update java code conventions linkJeff King2017-04-201-1/+1
| * | | | | | | | docs/bisect-lk2009: update nist report linkJeff King2017-04-201-1/+1
| * | | | | | | | docs/archimport: quote sourcecontrol.net referenceJeff King2017-04-201-1/+1
| * | | | | | | | gitcore-tutorial: update broken linkJeff King2017-04-201-1/+1
| * | | | | | | | doc: replace or.cz gitwiki link with git.wiki.kernel.orgJeff King2017-04-201-1/+1
| * | | | | | | | doc: use https links to avoid http redirectJeff King2017-04-203-9/+9
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'sf/putty-w-args'Junio C Hamano2017-04-261-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | connect.c: fix leak in handle_ssh_variantsf/putty-w-argsJeff King2017-04-201-1/+3
* | | | | | | | | Merge branch 'ab/completion-push-delete-ref'Junio C Hamano2017-04-262-0/+35
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | completion: expand "push --delete <remote> <ref>" for refs on that <remote>ab/completion-push-delete-refÆvar Arnfjörð Bjarmason2017-04-232-0/+35
* | | | | | | | | | Merge branch 'cc/split-index-config'Junio C Hamano2017-04-261-1/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | read-cache: avoid using git_path() in freshen_shared_index()cc/split-index-configChristian Couder2017-04-201-1/+2
* | | | | | | | | | | Merge branch 'jk/war-on-git-path'Junio C Hamano2017-04-2610-30/+28
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | am: drop "dir" parameter from am_state_initjk/war-on-git-pathJeff King2017-04-201-6/+4
| * | | | | | | | | | | replace strbuf_addstr(git_path()) with git_path_buf()Jeff King2017-04-202-6/+4
| * | | | | | | | | | | replace xstrdup(git_path(...)) with git_pathdup(...)Jeff King2017-04-202-3/+4
| * | | | | | | | | | | use git_path_* helper functionsJeff King2017-04-203-11/+11
| * | | | | | | | | | | branch: add edit_description() helperJeff King2017-04-201-3/+3
| * | | | | | | | | | | bisect: add git_path_bisect_terms helperJeff King2017-04-201-1/+2
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jh/add-index-entry-optim'Junio C Hamano2017-04-2610-2/+446
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | read-cache: speed up has_dir_name (part 2)jh/add-index-entry-optimJeff Hostetler2017-04-191-1/+62
| * | | | | | | | | | | read-cache: speed up has_dir_name (part 1)Jeff Hostetler2017-04-191-0/+45
| * | | | | | | | | | | read-cache: speed up add_index_entry during checkoutJeff Hostetler2017-04-191-1/+10
| * | | | | | | | | | | p0006-read-tree-checkout: perf test to time read-treeJeff Hostetler2017-04-194-0/+263
| * | | | | | | | | | | read-cache: add strcmp_offset functionJeff Hostetler2017-04-156-0/+66
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ss/submodule-shallow-doc'Junio C Hamano2017-04-261-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | gitmodules: clarify what history depth a shallow clone hasss/submodule-shallow-docSebastian Schuberth2017-04-191-2/+2
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ss/gitmodules-ignore-doc'Junio C Hamano2017-04-261-11/+20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | gitmodules: clarify the ignore option valuesss/gitmodules-ignore-docSebastian Schuberth2017-04-191-11/+20
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'nd/conditional-config-in-early-config'Junio C Hamano2017-04-265-30/+90
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | config: correct file reading order in read_early_config()nd/conditional-config-in-early-configNguyễn Thái Ngọc Duy2017-04-192-14/+30
| * | | | | | | | | | | config: handle conditional include when $GIT_DIR is not set upNguyễn Thái Ngọc Duy2017-04-173-8/+38
| * | | | | | | | | | | config: prepare to pass more info in git_config_with_options()Nguyễn Thái Ngọc Duy2017-04-173-15/+29
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ab/push-cas-doc-n-test'Junio C Hamano2017-04-262-0/+70
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | push: document & test --force-with-lease with multiple remotesab/push-cas-doc-n-testÆvar Arnfjörð Bjarmason2017-04-192-0/+70
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ls/travis-coccicheck'Junio C Hamano2017-04-261-0/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | travis-ci: add static analysis build job to run coccicheckls/travis-coccicheckLars Schneider2017-04-161-0/+12
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'ps/pathspec-empty-prefix-origin'Junio C Hamano2017-04-262-1/+23
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | pathspec: honor `PATHSPEC_PREFIX_ORIGIN` with empty prefixps/pathspec-empty-prefix-originPatrick Steinhardt2017-04-142-1/+23
* | | | | | | | | | | | Merge branch 'pc/t2027-git-to-pipe-cleanup'Junio C Hamano2017-04-261-14/+21
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t2027: avoid using pipespc/t2027-git-to-pipe-cleanupPrathamesh Chavan2017-04-141-14/+21
* | | | | | | | | | | | | Merge branch 'gb/rebase-signoff'Junio C Hamano2017-04-264-22/+71
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | rebase: pass --[no-]signoff option to git amgb/rebase-signoffGiuseppe Bilotta2017-04-183-1/+53
| * | | | | | | | | | | | builtin/am: fold am_signoff() into am_append_signoff()Giuseppe Bilotta2017-04-161-18/+15
| * | | | | | | | | | | | builtin/am: honor --signoff also when --rebasingGiuseppe Bilotta2017-04-161-3/+3
* | | | | | | | | | | | | Getting ready for -rc1Junio C Hamano2017-04-231-3/+51
* | | | | | | | | | | | | Merge branch 'dt/xgethostname-nul-termination'Junio C Hamano2017-04-237-14/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \