Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | lockfile: add accessor get_lock_file_path() | Michael Haggerty | 2015-08-10 | 6 | -20/+34 | |
| * | | | | | | | | | | | | | | | lockfile: add accessors get_lock_file_fd() and get_lock_file_fp() | Michael Haggerty | 2015-08-10 | 5 | -7/+26 | |
| * | | | | | | | | | | | | | | | create_bundle(): duplicate file descriptor to avoid closing it twice | Michael Haggerty | 2015-08-10 | 1 | -10/+16 | |
| * | | | | | | | | | | | | | | | lockfile: move documentation to lockfile.h and lockfile.c | Michael Haggerty | 2015-08-10 | 3 | -280/+283 | |
* | | | | | | | | | | | | | | | | Merge branch 'pt/am-builtin-options' | Junio C Hamano | 2015-08-25 | 3 | -10/+166 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | am: let --signoff override --no-signoffpt/am-builtin-options | Paul Tan | 2015-08-12 | 2 | -3/+45 | |
| * | | | | | | | | | | | | | | | | am: let command-line options override saved options | Paul Tan | 2015-08-12 | 2 | -4/+94 | |
| * | | | | | | | | | | | | | | | | test_terminal: redirect child process' stdin to a pty | Paul Tan | 2015-08-12 | 1 | -4/+28 | |
| | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'dt/refs-pseudo' | Junio C Hamano | 2015-08-25 | 5 | -56/+163 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | pseudoref: check return values from read_ref()dt/refs-pseudo | David Turner | 2015-08-11 | 1 | -2/+5 | |
| * | | | | | | | | | | | | | | | | sequencer: replace write_cherry_pick_head with update_ref | David Turner | 2015-07-31 | 1 | -19/+4 | |
| * | | | | | | | | | | | | | | | | bisect: use update_ref | David Turner | 2015-07-31 | 1 | -29/+8 | |
| * | | | | | | | | | | | | | | | | pseudorefs: create and use pseudoref update and delete functions | David Turner | 2015-07-31 | 1 | -8/+93 | |
| * | | | | | | | | | | | | | | | | refs: add ref_type function | David Turner | 2015-07-31 | 2 | -0/+34 | |
| * | | | | | | | | | | | | | | | | refs: introduce pseudoref and per-worktree ref concepts | David Turner | 2015-07-31 | 1 | -0/+21 | |
* | | | | | | | | | | | | | | | | | Merge branch 'dt/notes-multiple' | Junio C Hamano | 2015-08-25 | 4 | -12/+120 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | notes: handle multiple worktreesdt/notes-multiple | David Turner | 2015-08-11 | 2 | -0/+78 | |
| * | | | | | | | | | | | | | | | | | worktrees: add find_shared_symref | David Turner | 2015-08-11 | 2 | -12/+42 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'nd/dwim-wildcards-as-pathspecs' | Junio C Hamano | 2015-08-25 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | t2019: skip test requiring '*' in a file name non Windows | Johannes Sixt | 2015-08-11 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/long-error-messages' | Junio C Hamano | 2015-08-25 | 3 | -29/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | vreportf: avoid intermediate bufferjk/long-error-messages | Jeff King | 2015-08-11 | 1 | -3/+12 | |
| * | | | | | | | | | | | | | | | | | | | vreportf: report to arbitrary filehandles | Jeff King | 2015-08-11 | 3 | -29/+12 | |
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'ee/clean-remove-dirs' | Junio C Hamano | 2015-08-25 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | t7300-clean: require POSIXPERM for chmod 0 testee/clean-remove-dirs | Johannes Sixt | 2015-08-11 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jh/strbuf-read-use-read-in-full' | Junio C Hamano | 2015-08-25 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | strbuf_read(): skip unnecessary strbuf_grow() at eofjh/strbuf-read-use-read-in-full | Jim Hill | 2015-08-10 | 1 | -5/+5 | |
* | | | | | | | | | | | | | | | | | | | | | Sync with maint | Junio C Hamano | 2015-08-19 | 1 | -0/+49 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | Start preparing for 2.5.1 | Junio C Hamano | 2015-08-19 | 2 | -1/+50 | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'ta/docfix-index-format-tech' into maint | Junio C Hamano | 2015-08-19 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/parse-options-codeformat' into maint | Junio C Hamano | 2015-08-19 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/remove-unused-var-from-builtin-add' into maint | Junio C Hamano | 2015-08-19 | 1 | -2/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'kn/tag-doc-fix' into maint | Junio C Hamano | 2015-08-19 | 1 | -1/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'es/doc-clean-outdated-tools' into maint | Junio C Hamano | 2015-08-19 | 2 | -117/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/export-worktree' into maint | Junio C Hamano | 2015-08-19 | 2 | -0/+19 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/fast-import-optimize-current-from' into maint | Junio C Hamano | 2015-08-19 | 1 | -12/+17 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ib/scripted-parse-opt-better-hint-string' into maint | Junio C Hamano | 2015-08-19 | 3 | -68/+92 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'se/doc-checkout-ours-theirs' into maint | Junio C Hamano | 2015-08-19 | 1 | -0/+15 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cb/uname-in-untracked' into maint | Junio C Hamano | 2015-08-19 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'as/sparse-checkout-removal' into maint | Junio C Hamano | 2015-08-19 | 2 | -0/+56 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'db/send-pack-user-signingkey' into maint | Junio C Hamano | 2015-08-19 | 1 | -0/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jx/do-not-crash-receive-pack-wo-head' into maint | Junio C Hamano | 2015-08-19 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'da/subtree-date-confusion' into maint | Junio C Hamano | 2015-08-19 | 2 | -1/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fourth batch for 2.6 | Junio C Hamano | 2015-08-19 | 1 | -1/+34 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/complete-rebase-i-edit-todo' | Junio C Hamano | 2015-08-19 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | completion: offer '--edit-todo' during interactive rebasetb/complete-rebase-i-edit-todo | Thomas Braun | 2015-08-05 | 1 | -1/+4 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/git-path' | Junio C Hamano | 2015-08-19 | 30 | -363/+465 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | memoize common git-path "constant" filesjk/git-path | Jeff King | 2015-08-10 | 17 | -119/+151 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_repo_path: refactor path-allocation | Jeff King | 2015-08-10 | 1 | -14/+29 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | find_hook: keep our own static buffer | Jeff King | 2015-08-10 | 2 | -4/+11 |