Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sb/object-store-grafts' | Junio C Hamano | 2018-07-18 | 1 | -2/+2 |
|\ | |||||
| * | path.c: migrate global git_path_* to take a repository argument | Stefan Beller | 2018-05-18 | 1 | -2/+2 |
* | | Merge branch 'ab/refspec-init-fix' | Junio C Hamano | 2018-06-28 | 1 | -1/+1 |
|\ \ | |||||
| * | | refspec: s/refspec_item_init/&_or_die/g | Ævar Arnfjörð Bjarmason | 2018-06-11 | 1 | -1/+1 |
* | | | Merge branch 'rd/doc-remote-tracking-with-hyphen' | Junio C Hamano | 2018-06-18 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | Use hyphenated "remote-tracking branch" (docs and comments) | Robert P. J. Day | 2018-06-13 | 1 | -2/+2 |
* | | | | Merge branch 'bw/ref-prefix-for-configured-refspec' | Junio C Hamano | 2018-05-30 | 1 | -4/+5 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | pull: convert get_tracking_branch to use refspec_item_init | Brandon Williams | 2018-05-17 | 1 | -4/+4 |
| * | | | refspec: rename struct refspec to struct refspec_item | Brandon Williams | 2018-05-17 | 1 | -1/+1 |
| * | | | refspec: move refspec parsing logic into its own file | Brandon Williams | 2018-05-17 | 1 | -0/+1 |
* | | | | Merge branch 'js/use-bug-macro' | Junio C Hamano | 2018-05-30 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Replace all die("BUG: ...") calls by BUG() ones | Johannes Schindelin | 2018-05-06 | 1 | -1/+1 |
| |/ / / | |||||
* / / / | pull: accept --rebase=merges to recreate the branch topology | Johannes Schindelin | 2018-04-26 | 1 | -4/+10 |
|/ / / | |||||
* | / | exec_cmd: rename to use dash in file name | Stefan Beller | 2018-04-11 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge branch 'nd/parseopt-completion' | Junio C Hamano | 2018-03-14 | 1 | -1/+1 |
|\ \ | |||||
| * | | parse-options: let OPT__FORCE take optional flags argument | Nguyễn Thái Ngọc Duy | 2018-02-09 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'sb/pull-rebase-submodule' | Junio C Hamano | 2018-02-15 | 1 | -0/+2 |
|\ \ | |/ |/| | |||||
| * | builtin/pull: respect verbosity settings in submodules | Stefan Beller | 2018-01-25 | 1 | -0/+2 |
* | | 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 'sw/pull-ipv46-passthru' | Junio C Hamano | 2017-11-27 | 1 | -0/+12 |
|\ \ \ | |||||
| * | | | pull: pass -4/-6 option to 'git fetch' | Shuyu Wei | 2017-11-21 | 1 | -0/+12 |
* | | | | Merge branch 'ma/reduce-heads-leakfix' | Junio C Hamano | 2017-11-15 | 1 | -1/+4 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | reduce_heads: fix memory leaks | Martin Ågren | 2017-11-08 | 1 | -1/+4 |
* | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2017-11-06 | 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 |
| |/ / / | |||||
* / / / | pull: pass --signoff/--no-signoff to "git merge" | W. Trevor King | 2017-10-13 | 1 | -0/+6 |
|/ / / | |||||
* | | | pull: honor submodule.recurse config option | Nicolas Morey-Chaisemartin | 2017-09-07 | 1 | -0/+4 |
* | | | pull: fix cli and config option parsing order | Nicolas Morey-Chaisemartin | 2017-09-07 | 1 | -2/+2 |
* | | | Merge branch 'ma/parse-maybe-bool' | Junio C Hamano | 2017-08-22 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | treewide: deprecate git_config_maybe_bool, use git_parse_maybe_bool | Martin Ågren | 2017-08-07 | 1 | -2/+2 |
* | | | | Merge branch 'sb/pull-rebase-submodule' | Junio C Hamano | 2017-07-14 | 1 | -10/+63 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | pull: optionally rebase submodules (remote submodule changes only) | Stefan Beller | 2017-06-24 | 1 | -10/+63 |
* | | | | 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 'nd/fopen-errors' | Junio C Hamano | 2017-06-13 | 1 | -2/+1 |
|\ \ \ \ | |||||
| * | | | | use xfopen() in more places | Nguyễn Thái Ngọc Duy | 2017-05-26 | 1 | -2/+1 |
| |/ / / | |||||
* | | | | Merge branch 'tb/pull-ff-rebase-autostash' | Junio C Hamano | 2017-06-05 | 1 | -11/+14 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | pull: ff --rebase --autostash works in dirty repo | Tyler Brazier | 2017-06-01 | 1 | -11/+14 |
| |/ / | |||||
* | | | merge: convert checkout_fast_forward to struct object_id | brian m. carlson | 2017-05-08 | 1 | -2/+2 |
* | | | Convert lookup_commit* to struct object_id | brian m. carlson | 2017-05-08 | 1 | -5/+5 |
|/ / | |||||
* | | Merge branch 'jk/war-on-git-path' | Junio C Hamano | 2017-04-26 | 1 | -2/+2 |
|\ \ | |||||
| * | | use git_path_* helper functions | Jeff King | 2017-04-21 | 1 | -2/+2 |
| |/ | |||||
* | | Rename sha1_array to oid_array | brian m. carlson | 2017-03-31 | 1 | -3/+3 |
* | | Make sha1_array_append take a struct object_id * | brian m. carlson | 2017-03-31 | 1 | -1/+1 |
* | | sha1-array: convert internal storage for struct sha1_array to object_id | brian m. carlson | 2017-03-28 | 1 | -11/+11 |
* | | builtin/pull: convert to struct object_id | brian m. carlson | 2017-03-28 | 1 | -36/+36 |
* | | builtin/pull: convert portions to struct object_id | brian m. carlson | 2017-03-27 | 1 | -3/+3 |
|/ | |||||
* | Merge branch 'jc/pull-rebase-ff' | Junio C Hamano | 2016-12-19 | 1 | -4/+18 |
|\ | |||||
| * | pull: fast-forward "pull --rebase=true" | Junio C Hamano | 2016-11-29 | 1 | -4/+18 |