Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'ps/config-error' | Junio C Hamano | 2016-02-26 | 5 | -65/+42 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | config: rename git_config_set_or_die to git_config_setps/config-error | Patrick Steinhardt | 2016-02-22 | 5 | -35/+35 | |
| * | | | | | | | | | | | | | | | | | | | config: rename git_config_set to git_config_set_gently | Patrick Steinhardt | 2016-02-22 | 3 | -16/+16 | |
| * | | | | | | | | | | | | | | | | | | | init-db: die on config errors when initializing empty repo | Patrick Steinhardt | 2016-02-22 | 1 | -10/+10 | |
| * | | | | | | | | | | | | | | | | | | | clone: die on config error in cmd_clone | Patrick Steinhardt | 2016-02-22 | 1 | -4/+4 | |
| * | | | | | | | | | | | | | | | | | | | remote: die on config error when manipulating remotes | Patrick Steinhardt | 2016-02-22 | 1 | -27/+12 | |
| * | | | | | | | | | | | | | | | | | | | remote: die on config error when setting/adding branches | Patrick Steinhardt | 2016-02-22 | 1 | -17/+9 | |
| * | | | | | | | | | | | | | | | | | | | remote: die on config error when setting URL | Patrick Steinhardt | 2016-02-22 | 1 | -5/+6 | |
| * | | | | | | | | | | | | | | | | | | | submodule--helper: die on config error when cloning module | Patrick Steinhardt | 2016-02-22 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | branch: die on config error when editing branch description | Patrick Steinhardt | 2016-02-22 | 1 | -3/+2 | |
| * | | | | | | | | | | | | | | | | | | | branch: die on config error when unsetting upstream | Patrick Steinhardt | 2016-02-22 | 1 | -2/+2 | |
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'ls/config-origin' | Junio C Hamano | 2016-02-26 | 1 | -0/+33 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | config: add '--show-origin' option to print the origin of a config valuels/config-origin | Lars Schneider | 2016-02-22 | 1 | -0/+33 | |
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/tighten-alloc' | Junio C Hamano | 2016-02-26 | 21 | -101/+63 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | fetch-pack: simplify add_sought_entry | Jeff King | 2016-02-22 | 1 | -18/+9 | |
| * | | | | | | | | | | | | | | | | | | use st_add and st_mult for allocation size computation | Jeff King | 2016-02-22 | 7 | -9/+9 | |
| * | | | | | | | | | | | | | | | | | | convert trivial cases to FLEX_ARRAY macros | Jeff King | 2016-02-22 | 4 | -18/+11 | |
| * | | | | | | | | | | | | | | | | | | use xmallocz to avoid size arithmetic | Jeff King | 2016-02-22 | 3 | -3/+3 | |
| * | | | | | | | | | | | | | | | | | | convert trivial cases to ALLOC_ARRAY | Jeff King | 2016-02-22 | 9 | -14/+16 | |
| * | | | | | | | | | | | | | | | | | | convert manual allocations to argv_array | Jeff King | 2016-02-22 | 3 | -35/+13 | |
| * | | | | | | | | | | | | | | | | | | reflog_expire_cfg: NUL-terminate pattern field | Jeff King | 2016-02-19 | 1 | -5/+3 | |
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Merge branch 'jk/ref-cache-non-repository-optim' into maint | Junio C Hamano | 2016-02-05 | 1 | -25/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/diff-with-path-params' into maint | Junio C Hamano | 2016-02-05 | 2 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/list-tag-2.7-regression' into maint | Junio C Hamano | 2016-02-05 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/close-packs-before-gc' into maint | Junio C Hamano | 2016-02-05 | 4 | -0/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/fopen-harder' into maint | Junio C Hamano | 2016-02-05 | 3 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/clang-pedantic' into maint | Junio C Hamano | 2016-02-05 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tg/git-remote' | Junio C Hamano | 2016-02-26 | 2 | -16/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | remote: use remote_is_configured() for add and renametg/git-remote | Thomas Gummerer | 2016-02-16 | 1 | -5/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | remote: actually check if remote exits | Thomas Gummerer | 2016-02-16 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | remote: simplify remote_is_configured() | Thomas Gummerer | 2016-02-16 | 2 | -9/+8 | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/am-i-v-fix' | Junio C Hamano | 2016-02-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | am -i: fix "v"iewjc/am-i-v-fix | Junio C Hamano | 2016-02-17 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/worktree-add-B' | Junio C Hamano | 2016-02-24 | 1 | -4/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | worktree add -B: do the checkout test before update branchnd/worktree-add-B | Nguyễn Thái Ngọc Duy | 2016-02-15 | 1 | -1/+10 | |
| * | | | | | | | | | | | | | | | | | | | | | | | worktree: fix "add -B" | Nguyễn Thái Ngọc Duy | 2016-02-15 | 1 | -3/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/lose-name-path' | Junio C Hamano | 2016-02-24 | 2 | -21/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | list-objects: pass full pathname to callbacksjk/lose-name-path | Jeff King | 2016-02-12 | 2 | -21/+6 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | list-objects: drop name_path entirely | Jeff King | 2016-02-12 | 2 | -4/+4 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ew/force-ipv4' | Junio C Hamano | 2016-02-24 | 3 | -0/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | connect & http: support -4 and -6 switches for remote operationsew/force-ipv4 | Eric Wong | 2016-02-12 | 3 | -0/+18 | |
| | |_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/git-common-dir-fix' | Junio C Hamano | 2016-02-24 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | rev-parse: take prefix into account in --git-common-dirnd/git-common-dir-fix | Nguyễn Thái Ngọc Duy | 2016-02-12 | 1 | -1/+2 | |
| |/ / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/dwim-wildcards-as-pathspecs' | Junio C Hamano | 2016-02-24 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | / / / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | check_filename: tighten dwim-wildcard ambiguity | Jeff King | 2016-02-10 | 1 | -1/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | checkout: reorder check_filename conditional | Jeff King | 2016-02-10 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ah/stripspace-optstring' | Junio C Hamano | 2016-02-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | / / / / / / / / / / | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | stripspace: call U+0020 a "space" instead of a "blank"ah/stripspace-optstring | Alex Henrie | 2016-01-29 | 1 | -1/+1 | |
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/options-cleanup' | Junio C Hamano | 2016-02-10 | 7 | -102/+57 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | apply, ls-files: simplify "-z" parsingjk/options-cleanup | Jeff King | 2016-02-01 | 2 | -24/+6 |