Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'nd/completion-negation' | Junio C Hamano | 2018-06-28 | 1 | -4/+6 |
|\ | |||||
| * | completion: suppress some -no- options | Nguyễn Thái Ngọc Duy | 2018-05-29 | 1 | -4/+6 |
* | | Merge branch 'ma/unpack-trees-free-msgs' | Junio C Hamano | 2018-05-30 | 1 | -0/+1 |
|\ \ | |/ |/| | |||||
| * | unpack_trees_options: free messages when done | Martin Ågren | 2018-05-22 | 1 | -0/+1 |
* | | Merge branch 'ds/lazy-load-trees' | Junio C Hamano | 2018-05-23 | 1 | -6/+12 |
|\ \ | |/ |/| | |||||
| * | treewide: replace maybe_tree with accessor methods | Derrick Stolee | 2018-04-11 | 1 | -6/+12 |
| * | treewide: rename tree to maybe_tree | Derrick Stolee | 2018-04-11 | 1 | -6/+6 |
| * | Merge branch 'bw/c-plus-plus' into ds/lazy-load-trees | Junio C Hamano | 2018-04-11 | 1 | -98/+98 |
| |\ | |||||
* | \ | Merge branch 'bc/object-id' | Junio C Hamano | 2018-04-10 | 1 | -6/+6 |
|\ \ \ | |||||
| * | | | Convert find_unique_abbrev* to struct object_id | brian m. carlson | 2018-03-14 | 1 | -3/+3 |
| * | | | strbuf: convert strbuf_add_unique_abbrev to use struct object_id | brian m. carlson | 2018-03-14 | 1 | -1/+1 |
| * | | | tree: convert read_tree_recursive to struct object_id | brian m. carlson | 2018-03-14 | 1 | -2/+2 |
* | | | | Merge branch 'nd/parseopt-completion' | Junio C Hamano | 2018-03-14 | 1 | -2/+5 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | completion: use __gitcomp_builtin in _git_checkout | Nguyễn Thái Ngọc Duy | 2018-02-09 | 1 | -2/+5 |
| * | | | parse-options: let OPT__FORCE take optional flags argument | Nguyễn Thái Ngọc Duy | 2018-02-09 | 1 | -1/+1 |
* | | | | Merge branch 'jh/status-no-ahead-behind' | Junio C Hamano | 2018-03-08 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | status: support --no-ahead-behind in long formatjh/status-no-ahead-behind | Jeff Hostetler | 2018-01-24 | 1 | -1/+1 |
* | | | | | Merge branch 'bw/c-plus-plus' | Junio C Hamano | 2018-03-06 | 1 | -98/+98 |
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | |||||
| * | | | checkout: rename 'new' variables | Brandon Williams | 2018-02-22 | 1 | -98/+98 |
| | |/ | |/| | |||||
* | | | sha1_file: convert write_sha1_file to object_id | Patryk Obara | 2018-01-30 | 1 | -2/+1 |
|/ / | |||||
* | | Merge branch 'rs/lose-leak-pending' | Junio C Hamano | 2018-01-23 | 1 | -12/+1 |
|\ \ | |/ |/| | |||||
| * | checkout: avoid using the rev_info flag leak_pending | René Scharfe | 2017-12-28 | 1 | -12/+1 |
* | | Merge branch 'ks/branch-cleanup' | Junio C Hamano | 2017-12-27 | 1 | -1/+1 |
|\ \ | |||||
| * | | branch: group related arguments of create_branch() | Kaartic Sivaraam | 2017-12-07 | 1 | -1/+1 |
* | | | Merge branch 'ar/unconfuse-three-dots' | Junio C Hamano | 2017-12-19 | 1 | -2/+8 |
|\ \ \ | |||||
| * | | | checkout: describe_detached_head: remove ellipsis after committish | Ann T Ropea | 2017-12-06 | 1 | -2/+8 |
* | | | | Merge branch 'tg/worktree-create-tracking' | Junio C Hamano | 2017-12-19 | 1 | -40/+1 |
|\ \ \ \ | |||||
| * | | | | checkout: factor out functions to new lib file | Thomas Gummerer | 2017-11-27 | 1 | -40/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'bc/hash-algo' | Junio C Hamano | 2017-12-13 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Switch empty tree and blob lookups to use hash abstraction | brian m. carlson | 2017-11-13 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'jc/branch-name-sanity' | Junio C Hamano | 2017-11-28 | 1 | -5/+5 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | branch: split validate_new_branchname() into two | Junio C Hamano | 2017-10-13 | 1 | -5/+5 |
| | |/ | |/| | |||||
* | | | Merge branch 'mh/tidy-ref-update-flags' | Junio C Hamano | 2017-11-15 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | |||||
| * | | refs: rename constant `REF_NODEREF` to `REF_NO_DEREF` | Michael Haggerty | 2017-11-06 | 1 | -1/+1 |
* | | | Merge branch 'bc/object-id' | Junio C Hamano | 2017-11-06 | 1 | -5/+5 |
|\ \ \ | |/ / | |||||
| * | | refs: convert read_ref and read_ref_full to object_id | brian m. carlson | 2017-10-16 | 1 | -3/+3 |
| * | | refs: convert resolve_refdup and refs_resolve_refdup to struct object_id | brian m. carlson | 2017-10-16 | 1 | -1/+1 |
| * | | refs: convert update_ref and refs_update_ref to use struct object_id | brian m. carlson | 2017-10-16 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'ma/lockfile-fixes' | Junio C Hamano | 2017-11-06 | 1 | -8/+6 |
|\ \ | |/ |/| | |||||
| * | treewide: prefer lockfiles on the stack | Martin Ågren | 2017-10-06 | 1 | -8/+6 |
* | | Merge branch 'ma/builtin-unleak' | Junio C Hamano | 2017-10-07 | 1 | -0/+1 |
|\ \ | |||||
| * | | builtin/: add UNLEAKsma/builtin-unleak | Martin Ågren | 2017-10-02 | 1 | -0/+1 |
* | | | Merge branch 'rs/resolve-ref-optional-result' | Junio C Hamano | 2017-10-05 | 1 | -2/+1 |
|\ \ \ | |_|/ |/| | | |||||
| * | | refs: pass NULL to resolve_refdup() if hash is not neededrs/resolve-ref-optional-result | René Scharfe | 2017-10-01 | 1 | -2/+1 |
* | | | Merge branch 'ma/leakplugs' | Junio C Hamano | 2017-09-29 | 1 | -1/+8 |
|\ \ \ | |||||
| * | | | leak_pending: use `object_array_clear()`, not `free()` | Martin Ågren | 2017-09-24 | 1 | -1/+8 |
| | |/ | |/| | |||||
| * | | Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshake | Junio C Hamano | 2017-07-26 | 1 | -0/+3 |
| |\ \ | |||||
* | | | | consistently use "fallthrough" comments in switchesjk/fallthrough | Jeff King | 2017-09-22 | 1 | -0/+1 |
| |_|/ |/| | | |||||
* | | | Merge branch 'bw/submodule-config-cleanup' | Junio C Hamano | 2017-08-26 | 1 | -2/+1 |
|\ \ \ | |||||
| * | | | submodule: remove gitmodules_config | Brandon Williams | 2017-08-03 | 1 | -1/+0 |