2018-08-13 | color: add the meta color GIT_COLOR_REVERSE Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-08-13 | range-diff: use color for the commit pairs Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-08-13 | range-diff: do not show "function names" in hunk headers Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-08-13 | range-diff: adjust the output of the commit pairs Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-08-13 | range-diff: suppress the diff headers Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-08-13 | range-diff: indent the diffs just like tbdiff Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-08-13 | range-diff: right-trim commit messages Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-08-13 | range-diff: also show the diff between patches Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-08-13 | range-diff: improve the order of the shown commits Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-08-13 | range-diff: first rudimentary implementation Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-08-13 | Introduce `range-diff` to compare iterations of a topic... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-08-13 | linear-assignment: a function to solve least-cost assignment... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-08-09 | rebase --exec: make it work with --rebase-merges Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-08-08 | remote-curl: remove spurious period Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-08-08 | git-compat-util.h: fix typo Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-08-06 | t3430: demonstrate what -r, --autosquash & --exec should do Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-08-06 | pull --rebase=<type>: allow single-letter abbreviations... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-07-30 | vscode: let cSpell work on commit messages, too Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-07-30 | vscode: add a dictionary for cSpell Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-07-30 | vscode: use 8-space tabs, no trailing ws, etc for Git... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-07-30 | vscode: wrap commit messages at column 72 by default Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-07-30 | vscode: only overwrite C/C++ settings Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-07-30 | mingw: define WIN32 explicitly Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-07-30 | cache.h: extract enum declaration from inside a struct... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-07-30 | vscode: hard-code a couple defines Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-07-30 | contrib: add a script to initialize VS Code configuration Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-07-23 | t7406: avoid failures solely due to timing issues Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-07-16 | vcbuild/README: update to accommodate for missing common... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-07-11 | rebase --rebase-merges: adjust man page for octopus... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-07-11 | rebase --rebase-merges: add support for octopus merges Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-07-11 | merge: allow reading the merge commit message from... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-06-29 | Makefile: fix the "built from commit" code Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-06-18 | rebase --root: fix amending root commit messages Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-05-22 | is_{hfs,ntfs}_dotgitmodules: add tests Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-05-22 | is_ntfs_dotgit: match other .git files Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-05-17 | config: a user-provided invalid section is not a BUG Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-05-06 | Convert remaining die*(BUG) messages Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-05-06 | Replace all die("BUG: ...") calls by BUG() ones Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-05-06 | run-command: use BUG() to report bugs, not die() Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-05-06 | test-tool: help verifying BUG() code paths Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-05-06 | rebase -i --root: let the sequencer handle even the... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-05-06 | rebase --rebase-merges: root commits can be cousins... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-05-06 | sequencer: learn about the special "fake root commit... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-05-06 | rebase --rebase-merges: a "merge" into a new root is... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-05-06 | sequencer: allow introducing new root commits Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-05-06 | sequencer: extract helper to update active_cache_tree Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-05-01 | rebase --skip: clean up commit message after a failed... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-05-01 | sequencer: always commit without editing when asked for Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-05-01 | rebase -i: Handle "combination of <n> commits" with... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-05-01 | rebase -i: demonstrate bugs with fixup!/squash! commit... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-30 | Remove obsolete script to convert grafts to replace... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-30 | technical/shallow: describe why shallow cannot use... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-30 | technical/shallow: stop referring to grafts Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-30 | filter-branch: stop suggesting to use grafts Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-30 | Deprecate support for .git/info/grafts Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-30 | Add a test for `git replace --convert-graft-file` Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-30 | replace: introduce --convert-graft-file Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-30 | replace: prepare create_graft() for converting graft... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-30 | replace: "libify" create_graft() and callees Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-30 | tests: introduce test_unset_prereq, for debugging Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-26 | replace: avoid using die() to indicate a bug Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-26 | commit: Let the callback of for_each_mergetag return... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-26 | argv_array: offer to split a string by whitespace Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-26 | rebase -i --rebase-merges: add a section to the man... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-26 | rebase -i: introduce --rebase-merges=[no-]rebase-cousins Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-26 | pull: accept --rebase=merges to recreate the branch... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-26 | rebase --rebase-merges: avoid "empty merges" Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-26 | sequencer: handle post-rewrite for merge commands Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-26 | sequencer: make refs generated by the `label` command... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-26 | rebase: introduce the --rebase-merges option Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-26 | rebase-helper --make-script: introduce a flag to rebase... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-26 | sequencer: fast-forward `merge` commands, if possible Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-26 | sequencer: introduce the `merge` command Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-26 | sequencer: introduce new commands to reset the revision Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-26 | sequencer: offer helpful advice when a command was... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-26 | sequencer: refactor how original todo list lines are... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-26 | sequencer: make rearrange_squash() a bit more obvious Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-26 | sequencer: avoid using errno clobbered by rollback_lock_file() Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-24 | git_setup_gettext: plug memory leak Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-24 | gettext: avoid initialization if the locale dir is... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-24 | config: document the settings to colorize push errors... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-24 | push: test to verify that push errors are colored Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-24 | color: introduce support for colorizing stderr Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-11 | mingw/msvc: use the new-style RUNTIME_PREFIX helper Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-11 | exec_cmd: provide a new-style RUNTIME_PREFIX helper... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-09 | git_config_set: reuse empty sections Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-09 | git config --unset: remove empty sections (in the common... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-09 | git_config_set: make use of the config parser's event... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-09 | git_config_set: do not use a state machine Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-09 | config_set_store: rename some fields for consistency Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-09 | config: avoid using the global variable `store` Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-09 | config: introduce an optional event stream while parsing Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-09 | t1300: `--unset-all` can leave an empty section behind... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-09 | t1300: add a few more hairy examples of sections becoming... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-09 | t5404: relax overzealous test Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-05 | t1300: remove unreasonable expectation from TODO Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-05 | t1300: avoid relying on a bug Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-05 | config --replace-all: avoid extra line breaks Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-05 | t1300: demonstrate that --replace-all can "invent"... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
2018-04-05 | t1300: rename it to reflect that `repo-config` was... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |