diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-03 18:01:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-03 18:01:17 (GMT) |
| commit | 5f02274e4c4506b923b510a24da7991656f4db14 (patch) | |
| tree | 83e695ab1d81730b494bcf4ae7a6aeee6a6ff023 /builtin/blame.c | |
| parent | 0b9ce18ede8343116f4e5f008c05169f69cafc07 (diff) | |
| parent | b1456605c26eb6bd991b70b0ca0a3ce0f02473e9 (diff) | |
| download | git-5f02274e4c4506b923b510a24da7991656f4db14.zip git-5f02274e4c4506b923b510a24da7991656f4db14.tar.gz git-5f02274e4c4506b923b510a24da7991656f4db14.tar.bz2 | |
Merge branch 'pt/pull-builtin'
Reimplement 'git pull' in C.
* pt/pull-builtin:
pull: remove redirection to git-pull.sh
pull --rebase: error on no merge candidate cases
pull --rebase: exit early when the working directory is dirty
pull: configure --rebase via branch.<name>.rebase or pull.rebase
pull: teach git pull about --rebase
pull: set reflog message
pull: implement pulling into an unborn branch
pull: fast-forward working tree if head is updated
pull: check if in unresolved merge state
pull: support pull.ff config
pull: error on no merge candidates
pull: pass git-fetch's options to git-fetch
pull: pass git-merge's options to git-merge
pull: pass verbosity, --progress flags to fetch and merge
pull: implement fetch + merge
pull: implement skeletal builtin pull
argv-array: implement argv_array_pushv()
parse-options-cb: implement parse_opt_passthru_argv()
parse-options-cb: implement parse_opt_passthru()
Diffstat (limited to 'builtin/blame.c')
0 files changed, 0 insertions, 0 deletions