| 2018-12-11 | rebase: add a config option to default to --reschedule... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-12-11 | rebase: introduce --reschedule-failed-exec Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-11-30 | rebase --stat: fix when rebasing to an unrelated history Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-11-30 | rebase: fix GIT_REFLOG_ACTION regression Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-11-21 | rebase: warn about the correct tree's OID Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-11-21 | legacy-rebase: backport -C<n> and --whitespace=<option... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-11-16 | mingw: replace an obsolete link with the superseding one Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-11-16 | tests: explicitly use `git.exe` on Windows Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-11-16 | tests: do not require Git to be built when testing... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-11-16 | config: report a bug if git_dir exists without commondir Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-11-16 | rebase: validate -C<n> and --whitespace=<mode> parameters... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-11-16 | rebase: really just passthru the `git am` options Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-11-14 | mingw: use `CreateHardLink()` directly Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-11-14 | t/lib-gettext: test installed git-sh-i18n if GIT_TEST_INSTAL... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-11-14 | tests: respect GIT_TEST_INSTALLED when initializing... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-11-14 | tests: fix GIT_TEST_INSTALLED's PATH to include t/helper/ Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-11-13 | built-in rebase: reinstate `checkout -q` behavior where... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-11-13 | rebase: prepare reset_head() for more flags Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-11-13 | rebase: consolidate clean-up code before leaving reset_head() Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-11-13 | apply --recount: allow "no-op hunks" Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-11-13 | status: rebase and merge can be in progress at the... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-11-13 | built-in rebase --skip/--abort: clean up stale .git... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-11-13 | rebase -i: include MERGE_HEAD into files to clean up Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-11-13 | rebase -r: do not write MERGE_HEAD unless needed Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-11-13 | rebase -r: demonstrate bug with conflicting merges Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-11-12 | Update .mailmap Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-11-08 | built-in rebase --autostash: leave the current branch... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-11-08 | built-in rebase: demonstrate regression with --autostash Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-11-07 | Windows: force-recompile git.res for differing architectures Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-11-02 | tests: optionally skip `git rebase -p` tests Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-11-02 | t3418: decouple test cases from a previous `rebase... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-11-02 | t3404: decouple some test cases from outcomes of previous... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-10-31 | mingw: fix isatty() after dup2() Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-10-31 | mingw: unset PERL5LIB by default Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-10-31 | config: move Windows-specific config settings into... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-10-31 | config: allow for platform-specific core.* config settings Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-10-31 | config: rename `dummy` parameter to `cb` in git_default_config() Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-10-31 | mingw: reencode environment variables on the fly (UTF... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-10-31 | t7800: fix quoting Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-10-26 | http: when using Secure Channel, ignore sslCAInfo by... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-10-25 | repack -ad: prune the list of shallow commits Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-10-25 | shallow: offer to prune only non-existing entries Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-10-25 | repack: point out a bug handling stale shallow info Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-10-24 | mingw: ensure `getcwd()` reports the correct case Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-10-24 | mingw: load system libraries the recommended way Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-10-24 | rebase --autostash: fix issue with dirty submodules Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-10-24 | rebase --autostash: demonstrate a problem with dirty... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-10-24 | mingw: factor out code to set stat() data Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-10-23 | rebase (autostash): use an explicit OID to apply the... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-10-23 | rebase (autostash): store the full OID in <state-dir... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-10-23 | rebase (autostash): avoid duplicate call to state_dir_path() Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-10-19 | pack-objects (mingw): initialize `packing_data` mutex... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-10-19 | pack-objects (mingw): demonstrate a segmentation fault... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-10-19 | pack-objects: fix typo 'detla' -> 'delta' Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-10-16 | http: add support for selecting SSL backends at runtime Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-10-16 | mingw: use domain information for default email Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-10-16 | getpwuid(mingw): provide a better default for the user... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-10-16 | getpwuid(mingw): initialize the structure only once Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-10-12 | rebase -i: introduce the 'break' command Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-10-11 | rebase -i: clarify what happens on a failed `exec` Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-10-11 | builtin rebase: prepare for builtin rebase -i Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-10-04 | mingw: bump the minimum Windows version to Vista Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-10-04 | mingw: set _WIN32_WINNT explicitly for Git for Windows Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-10-04 | compat/poll: prepare for targeting Windows Vista Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-09-04 | rebase -i: be careful to wrap up fixup/squash chains Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-09-04 | rebase -i --autosquash: demonstrate a problem skipping... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-08-15 | chainlint: fix for core.autocrlf=true Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-08-13 | range-diff: use dim/bold cues to improve dual color... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-08-13 | range-diff: make --dual-color the default mode Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-08-13 | range-diff: left-pad patch numbers Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-08-13 | completion: support `git range-diff` Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-08-13 | range-diff: populate the man page Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-08-13 | range-diff --dual-color: skip white-space warnings Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-08-13 | range-diff: offer to dual-color the diffs Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 2018-08-13 | diff: add an internal option to dual-color diffs of... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
diff | tree |
| 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 |