aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* wt-status: make the require_clean_work_tree() function reusableJohannes Schindelin2016-10-07
* pull: make code more similar to the shell script againJohannes Schindelin2016-10-07
* pull: drop confusing prefix parameter of die_on_unclean_work_tree()Johannes Schindelin2016-10-07
* Merge branch 'sb/submodule-clone-rr'Junio C Hamano2016-09-08
|\
| * clone: recursive and reference option triggers submodule alternatesStefan Beller2016-08-17
| * clone: implement optional referencesStefan Beller2016-08-15
| * clone: clarify option_reference as requiredStefan Beller2016-08-15
| * clone: factor out checking for an alternate pathStefan Beller2016-08-15
| * submodule--helper update-clone: allow multiple referencesStefan Beller2016-08-12
| * submodule--helper module-clone: allow multiple referencesStefan Beller2016-08-12
* | Merge branch 'jh/status-v2-porcelain'Junio C Hamano2016-09-08
|\ \
| * | status: print branch info with --porcelain=v2 --branchJeff Hostetler2016-08-11
| * | status: collect per-file data for --porcelain=v2Jeff Hostetler2016-08-11
| * | status: support --porcelain[=<version>]Jeff Hostetler2016-08-05
| * | status: cleanup API to wt_status_printJeff Hostetler2016-08-05
| * | status: rename long-format print routinesJeff Hostetler2016-08-05
* | | Merge branch 'rt/help-unknown'Junio C Hamano2016-09-08
|\ \ \
| * | | help: introduce option --exclude-guidesRalf Thielow2016-08-30
| * | | Merge branch 'js/no-html-bypass-on-windows' into rt/help-unknownJunio C Hamano2016-08-26
| |\ \ \
* | \ \ \ Merge branch 'cc/receive-pack-limit'Junio C Hamano2016-09-08
|\ \ \ \ \
| * | | | | receive-pack: allow a maximum input size to be specifiedJeff King2016-08-24
| * | | | | unpack-objects: add --max-input-size=<size> optionChristian Couder2016-08-24
| * | | | | index-pack: add --max-input-size=<size> optionJeff King2016-08-24
* | | | | | Merge branch 'jk/format-patch-number-singleton-patch-with-cover'Junio C Hamano2016-09-08
|\ \ \ \ \ \
| * | | | | | format-patch: show 0/1 and 1/1 for singleton patch with cover letterJacob Keller2016-08-23
* | | | | | | Merge branch 'mh/blame-worktree'Junio C Hamano2016-08-31
|\ \ \ \ \ \ \
| * | | | | | | blame: fix segfault on untracked filesThomas Gummerer2016-08-29
* | | | | | | | Merge branch 'js/no-html-bypass-on-windows'Junio C Hamano2016-08-25
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | |
| * | | | | | Revert "display HTML in default browser using Windows' shell API"Johannes Schindelin2016-08-19
* | | | | | | Merge branch 'sb/checkout-explit-detach-no-advice'Junio C Hamano2016-08-19
|\ \ \ \ \ \ \
| * | | | | | | checkout: do not mention detach advice for explicit --detach optionStefan Beller2016-08-15
| | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'jk/reset-ident-time-per-commit' into maintJunio C Hamano2016-08-12
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'rs/use-strbuf-addstr' into maintJunio C Hamano2016-08-10
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'os/no-verify-skips-commit-msg-too' into maintJunio C Hamano2016-08-10
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'rs/rm-strbuf-optim' into maintJunio C Hamano2016-08-10
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/parse-options-concat' into maintJunio C Hamano2016-08-10
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'pb/commit-editmsg-path' into maintJunio C Hamano2016-08-08
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/pack-ofs-4gb-limit' into maintJunio C Hamano2016-08-08
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/blame-worktree' into maintJunio C Hamano2016-08-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jk/tighten-alloc'Junio C Hamano2016-08-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | receive-pack: use FLEX_ALLOC_MEM in queue_command()René Scharfe2016-08-13
* | | | | | | | | | | | | | | Merge branch 'kw/patch-ids-optim'Junio C Hamano2016-08-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | rebase: avoid computing unnecessary patch IDsKevin Willford2016-08-11
| | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'js/mv-dir-to-new-directory'Junio C Hamano2016-08-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git mv: do not keep slash in `git mv dir non-existing-dir/`Johannes Schindelin2016-08-08
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'rs/use-strbuf-add-unique-abbrev'Junio C Hamano2016-08-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | use strbuf_add_unique_abbrev() for adding short hashesRené Scharfe2016-08-06
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'rs/merge-add-strategies-simplification'Junio C Hamano2016-08-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | merge: use string_list_split() in add_strategies()René Scharfe2016-08-05
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'rs/child-process-init'Junio C Hamano2016-08-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \