Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ab/free-and-null' | Junio C Hamano | 2017-06-24 | 1 | -4/+2 |
|\ | |||||
| * | *.[ch] refactoring: make use of the FREE_AND_NULL() macro | Ævar Arnfjörð Bjarmason | 2017-06-16 | 1 | -4/+2 |
* | | Merge branch 'bw/config-h' | Junio C Hamano | 2017-06-24 | 1 | -0/+1 |
|\ \ | |/ |/| | |||||
| * | config: don't include config.h by default | Brandon Williams | 2017-06-15 | 1 | -0/+1 |
* | | Merge branch 'js/plug-leaks' | Junio C Hamano | 2017-05-29 | 1 | -3/+5 |
|\ \ | |||||
| * | | show_worktree(): plug memory leak | Johannes Schindelin | 2017-05-08 | 1 | -3/+5 |
| |/ | |||||
* | | Merge branch 'js/larger-timestamps' | Junio C Hamano | 2017-05-16 | 1 | -2/+2 |
|\ \ | |/ |/| | |||||
| * | timestamp_t: a new data type for timestamps | Johannes Schindelin | 2017-04-27 | 1 | -2/+2 |
* | | Merge branch 'nd/worktree-add-lock' | Junio C Hamano | 2017-04-26 | 1 | -4/+11 |
|\ \ | |||||
| * | | worktree add: add --lock option | Nguyễn Thái Ngọc Duy | 2017-04-21 | 1 | -4/+11 |
| |/ | |||||
* | | Merge branch 'jk/war-on-git-path' | Junio C Hamano | 2017-04-26 | 1 | -4/+2 |
|\ \ | |/ |/| | |||||
| * | replace strbuf_addstr(git_path()) with git_path_buf() | Jeff King | 2017-04-21 | 1 | -4/+2 |
* | | prefix_filename: return newly allocated string | Jeff King | 2017-03-21 | 1 | -1/+2 |
* | | prefix_filename: drop length parameter | Jeff King | 2017-03-21 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'ps/worktree-prune-help-fix' | Junio C Hamano | 2017-02-10 | 1 | -2/+2 |
|\ | |||||
| * | worktree: fix option descriptions for `prune` | Patrick Steinhardt | 2017-02-06 | 1 | -2/+2 |
* | | worktree list: keep the list sorted | Nguyễn Thái Ngọc Duy | 2016-11-28 | 1 | -1/+1 |
* | | worktree.c: get_worktrees() takes a new flag argument | Nguyễn Thái Ngọc Duy | 2016-11-28 | 1 | -3/+3 |
* | | get_worktrees() must return main worktree as first item even on error | Nguyễn Thái Ngọc Duy | 2016-11-28 | 1 | -2/+4 |
* | | worktree: reorder an if statement | Nguyễn Thái Ngọc Duy | 2016-11-28 | 1 | -3/+3 |
* | | worktree: honor configuration variables | Junio C Hamano | 2016-09-27 | 1 | -0/+2 |
* | | use CHILD_PROCESS_INIT to initialize automatic variables | René Scharfe | 2016-08-06 | 1 | -4/+2 |
* | | Merge branch 'nd/worktree-lock' | Junio C Hamano | 2016-07-28 | 1 | -0/+66 |
|\ \ | |||||
| * | | worktree: add "unlock" command | Nguyễn Thái Ngọc Duy | 2016-07-09 | 1 | -0/+28 |
| * | | worktree: add "lock" command | Nguyễn Thái Ngọc Duy | 2016-07-09 | 1 | -0/+38 |
* | | | avoid using sha1_to_hex output as printf format | Jeff King | 2016-07-08 | 1 | -1/+1 |
* | | | Merge branch 'nd/worktree-cleanup-post-head-protection' | Junio C Hamano | 2016-07-06 | 1 | -4/+6 |
|\| | | |||||
| * | | worktree: simplify prefixing paths | Nguyễn Thái Ngọc Duy | 2016-05-24 | 1 | -1/+3 |
| * | | worktree: avoid 0{40}, too many zeroes, hard to read | Nguyễn Thái Ngọc Duy | 2016-05-24 | 1 | -1/+1 |
| * | | worktree.c: use is_dot_or_dotdot() | Nguyễn Thái Ngọc Duy | 2016-05-24 | 1 | -1/+1 |
| * | | git-worktree.txt: keep subcommand listing in alphabetical order | Nguyễn Thái Ngọc Duy | 2016-05-24 | 1 | -1/+1 |
* | | | worktree: allow "-" short-hand for @{-1} in add command | Jordan DE GEA | 2016-05-31 | 1 | -0/+3 |
* | | | Merge branch 'nd/worktree-various-heads' | Junio C Hamano | 2016-05-23 | 1 | -2/+2 |
|\| | | |||||
| * | | worktree.c: check whether branch is rebased in another worktree | Nguyễn Thái Ngọc Duy | 2016-04-22 | 1 | -2/+2 |
* | | | Merge branch 'nd/error-errno' | Junio C Hamano | 2016-05-17 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | builtin/worktree.c: use error_errno() | Nguyễn Thái Ngọc Duy | 2016-05-09 | 1 | -1/+1 |
* | | | worktree: add: introduce --checkout option | Ray Zhang | 2016-03-29 | 1 | -11/+18 |
|/ / | |||||
* | | Merge branch 'jk/tighten-alloc' | Junio C Hamano | 2016-02-26 | 1 | -1/+1 |
|\ \ | |||||
| * | | use xmallocz to avoid size arithmetic | Jeff King | 2016-02-22 | 1 | -1/+1 |
* | | | worktree add -B: do the checkout test before update branch | Nguyễn Thái Ngọc Duy | 2016-02-16 | 1 | -1/+10 |
* | | | worktree: fix "add -B" | Nguyễn Thái Ngọc Duy | 2016-02-16 | 1 | -3/+1 |
|/ / | |||||
* | | Convert struct object to object_id | brian m. carlson | 2015-11-20 | 1 | -1/+1 |
* | | Merge branch 'es/worktree-add' | Junio C Hamano | 2015-10-26 | 1 | -1/+1 |
|\ \ | |||||
| * | | worktree: usage: denote <branch> as optional with 'add' | Sidhant Sharma | 2015-10-19 | 1 | -1/+1 |
* | | | worktree: add 'list' command | Michael Rappazzo | 2015-10-08 | 1 | -0/+88 |
* | | | Merge branch 'jc/am-state-fix' | Junio C Hamano | 2015-09-01 | 1 | -5/+5 |
|\ \ \ | |||||
| * | | | write_file(): drop caller-supplied LF from calls to create a one-liner file | Junio C Hamano | 2015-08-25 | 1 | -5/+5 |
| * | | | write_file(): drop "fatal" parameter | Junio C Hamano | 2015-08-24 | 1 | -5/+5 |
* | | | | Merge branch 'es/worktree-add-cleanup' | Junio C Hamano | 2015-08-12 | 1 | -40/+83 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | worktree: populate via "git reset --hard" rather than "git checkout" | Eric Sunshine | 2015-07-20 | 1 | -2/+1 |