2018-05-08 | Merge branch 'tb/config-type' |
diff | tree |
2018-05-08 | Merge branch 'sg/doc-gc-quote-mismatch-fix' |
diff | tree |
2018-05-08 | Merge branch 'sg/completion-clear-cached' |
diff | tree |
2018-05-08 | Merge branch 'sb/worktree-remove-opt-force' |
diff | tree |
2018-05-08 | Merge branch 'ma/double-dashes-in-docs' |
diff | tree |
2018-05-08 | Merge branch 'tq/t1510' |
diff | tree |
2018-05-08 | Merge branch 'so/glossary-ancestor' |
diff | tree |
2018-05-08 | Merge branch 'ls/checkout-encoding' |
diff | tree |
2018-05-08 | Merge branch 'ab/nuke-emacs-contrib' |
diff | tree |
2018-05-08 | Merge branch 'nd/warn-more-for-devs' |
diff | tree |
2018-05-08 | Merge branch 'sb/object-store-replace' |
diff | tree |
2018-05-08 | Merge branch 'ds/commit-graph' |
diff | tree |
2018-05-08 | Merge branch 'js/empty-config-section-fix' |
diff | tree |
2018-05-08 | Merge branch 'ot/libify-get-ref-atom-value' |
diff | tree |
2018-05-08 | Merge branch 'sb/submodule-move-nested' |
diff | tree |
2018-05-08 | Merge branch 'dj/runtime-prefix' |
diff | tree |
2018-05-08 | Merge branch 'ab/simplify-perl-makefile' |
diff | tree |
2018-05-08 | Merge branch 'bw/protocol-v2' |
diff | tree |
2018-05-08 | mailmap: update brian m. carlson's email address Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-05-07 | completion: load completion file for external subcommand Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-05-07 | Documentation: render revisions correctly under Asciidoctor Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-05-07 | Documentation: use 8-space tabs with Asciidoctor Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-05-06 | completion: fix misspelled config key aliasesfiletype Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-05-06 | pack-objects: validation and documentation about unreachable... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-05-06 | doc: normalize [--options] to [options] in git-diff Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-05-06 | doc: add note about shell quoting to revision.txt Reviewed-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-05-06 | git-svn: remove ''--add-author-from' for 'commit-diff' Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-05-06 | doc: add '-d' and '-o' for 'git push' Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-05-06 | doc: clarify ignore rules for git ls-files Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-05-06 | doc: align 'diff --no-index' in text and synopsis Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-05-06 | doc: improve formatting in githooks.txt Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-05-06 | rebase --rebase-merges: root commits can be cousins... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-05-06 | rebase --rebase-merges: a "merge" into a new root is... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-05-06 | sequencer: allow introducing new root commits Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-05-06 | rebase -i --root: let the sequencer handle even the... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-05-06 | sequencer: learn about the special "fake root commit... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-05-06 | sequencer: extract helper to update active_cache_tree Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-05-06 | perf/bisect_run_script: disable codespeed Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-05-06 | wt-status: use settings from git_diff_ui_config Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-05-06 | git-send-email: allow re-editing of message Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-05-04 | git: add -P as a short option for --no-pager Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-05-04 | test-drop-caches: simplify delay loading of NtSetSystemInfor... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-05-02 | doc: keep first level section header in upper case Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-05-02 | coccinelle: avoid wrong transformation suggestions... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-05-02 | format-patch: make cover letters always text/plain Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-05-02 | unpack_trees: fix breakage when o->src_index != o-... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-05-01 | test: correct detection of UTF8_NFD_TO_NFC for APFS Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-05-01 | rebase --skip: clean up commit message after a failed... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-05-01 | sequencer: always commit without editing when asked for Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-05-01 | rebase -i: Handle "combination of <n> commits" with... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-05-01 | rebase -i: demonstrate bugs with fixup!/squash! commit... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-30 | Remove obsolete script to convert grafts to replace... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-30 | technical/shallow: describe why shallow cannot use... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-30 | technical/shallow: stop referring to grafts Helped-by: Junio Hamano <gitster@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-30 | filter-branch: stop suggesting to use grafts Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-30 | Deprecate support for .git/info/grafts Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-30 | Add a test for `git replace --convert-graft-file` Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-30 | replace: introduce --convert-graft-file Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-30 | replace: prepare create_graft() for converting graft... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-30 | replace: "libify" create_graft() and callees Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-30 | tests: introduce test_unset_prereq, for debugging Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-30 | worktree: teach "add" to check out existing branches Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-30 | worktree: factor out dwim_branch function Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-30 | worktree: improve message when creating a new worktree Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-30 | worktree: remove extra members from struct add_opts Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-27 | .gitattributes: add a diff driver for Python Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-27 | .gitattributes: use the "perl" differ for Perl Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-27 | .gitattributes: add *.pl extension for Perl Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-26 | replace: avoid using die() to indicate a bug Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-26 | commit: Let the callback of for_each_mergetag return... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-26 | argv_array: offer to split a string by whitespace Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-26 | rebase -i --rebase-merges: add a section to the man... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-26 | rebase -i: introduce --rebase-merges=[no-]rebase-cousins Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-26 | pull: accept --rebase=merges to recreate the branch... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-26 | rebase --rebase-merges: avoid "empty merges" Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-26 | sequencer: handle post-rewrite for merge commands Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-26 | sequencer: make refs generated by the `label` command... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-26 | rebase --rebase-merges: add test for --keep-empty Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-26 | rebase: introduce the --rebase-merges option Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-26 | rebase-helper --make-script: introduce a flag to rebase... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-26 | sequencer: fast-forward `merge` commands, if possible Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-26 | sequencer: introduce the `merge` command Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-26 | sequencer: introduce new commands to reset the revision Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-26 | git-rebase--interactive: clarify arguments Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-26 | sequencer: offer helpful advice when a command was... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-26 | sequencer: refactor how original todo list lines are... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-26 | sequencer: make rearrange_squash() a bit more obvious Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-26 | sequencer: avoid using errno clobbered by rollback_lock_file() Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-26 | perf/aggregate: use Getopt::Long for option parsing Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-26 | cache.h: allow oid_object_info to handle arbitrary... Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-26 | packfile: add repository argument to cache_or_unpack_entry Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-26 | packfile: add repository argument to unpack_entry Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-26 | packfile: add repository argument to read_object Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-26 | packfile: add repository argument to packed_object_info Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-26 | packfile: add repository argument to packed_to_object_type Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-26 | packfile: add repository argument to retry_bad_packed_offset Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-26 | cache.h: add repository argument to oid_object_info Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-26 | cache.h: add repository argument to oid_object_info_extended Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-25 | The fourth batch for 2.18 Signed-off-by: Junio C Hamano <gitster@pobox.com> |
diff | tree |
2018-04-25 | Merge branch 'jm/mem-pool' |
diff | tree |