?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
built-in add -p: handle diff.algorithm
2020-01-15 Johannes Schindelinbuilt-in add -p: handle diff.algorithm
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2020-01-15 Johannes Schindelinbuilt-in add -p: support interactive.diffFilter
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2020-01-15 Johannes Schindelint3701: adjust difffilter test
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-22 Johannes Schindelincommit --interactive: make it work with the built-in...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-22 Johannes Schindelinbuilt-in add -p: implement the "worktree" patch modes
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-22 Johannes Schindelinbuilt-in add -p: implement the "checkout" patch modes
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-22 Johannes Schindelinbuilt-in stash: use the built-in `git add -p` if so...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-22 Johannes Schindelinlegacy stash -p: respect the add.interactive.usebuiltin...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-22 Johannes Schindelinbuilt-in add -p: implement the "stash" and "reset"...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-22 Johannes Schindelinbuilt-in add -p: prepare for patch modes other than...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-13 Johannes Schindelinbuilt-in add -p: show helpful hint when nothing can...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-13 Johannes Schindelinbuilt-in add -p: only show the applicable parts of...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-13 Johannes Schindelinbuilt-in add -p: implement the 'q' ("quit") command
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-13 Johannes Schindelinbuilt-in add -p: implement the '/' ("search regex"...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-13 Johannes Schindelinbuilt-in add -p: implement the 'g' ("goto") command
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-13 Johannes Schindelinbuilt-in add -p: implement hunk editing
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-13 Johannes Schindelinstrbuf: add a helper function to call the editor "on...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-13 Johannes Schindelinbuilt-in add -p: coalesce hunks after splitting them
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-13 Johannes Schindelinbuilt-in add -p: implement the hunk splitting feature
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-13 Johannes Schindelinbuilt-in add -p: show different prompts for mode changes...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-13 Johannes Schindelinbuilt-in app -p: allow selecting a mode change as a...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-13 Johannes Schindelinbuilt-in add -p: handle deleted empty files
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-13 Johannes Schindelinbuilt-in add -p: support multi-file diffs
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-13 Johannes Schindelinbuilt-in add -p: offer a helpful error message when...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-13 Johannes Schindelinbuilt-in add -p: color the prompt and the help text
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-13 Johannes Schindelinbuilt-in add -p: adjust hunk headers as needed
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-13 Johannes Schindelinbuilt-in add -p: show colored hunks by default
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-13 Johannes Schindelinbuilt-in add -i: wire up the new C code for the `patch...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-13 Johannes Schindelinbuilt-in add -i: start implementing the `patch` functionalit...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-06 Johannes Schindelinapply --allow-overlap: fix a corner case
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-06 Johannes Schindelingit add -p: use non-zero exit code when the diff generation...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-06 Johannes Schindelint3701: verify that the diff.algorithm config setting...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-06 Johannes Schindelint3701: verify the shown messages when nothing can be...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-06 Johannes Schindelint3701: add a test for the different `add -p` prompts
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-06 Johannes Schindelint3701: avoid depending on the TTY prerequisite
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-06 Johannes Schindelint3701: add a test for advanced split-hunk editing
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-01 Johannes Schindelinbuilt-in add -i: offer the `quit` command
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-01 Johannes Schindelinbuilt-in add -i: re-implement the `diff` command
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-01 Johannes Schindelinbuilt-in add -i: implement the `patch` command
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-01 Johannes Schindelinbuilt-in add -i: re-implement `add-untracked` in C
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-01 Johannes Schindelinbuilt-in add -i: re-implement `revert` in C
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-01 Johannes Schindelinbuilt-in add -i: implement the `update` command
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-01 Johannes Schindelinbuilt-in add -i: prepare for multi-selection commands
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-01 Johannes Schindelinbuilt-in add -i: allow filtering the modified files...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-12-01 Johannes Schindelinadd-interactive: make sure to release `rev.prune_data`
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-11-18 Johannes Schindelinbuilt-in add -i: support `?` (prompt help)
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-11-18 Johannes Schindelinbuilt-in add -i: show unique prefixes of the commands
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2019-11-18 Johannes Schindelinbuilt-in add -i: implement the main loop
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-11-14 Johannes SchindelinStart to implement a built-in version of `git add ...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-10-28 Johannes Schindelinmingw: avoid a buffer overrun in `needs_hiding()`
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-10-23 Johannes Schindelinci(osx): use new location of the `perforce` cask
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-10-23 Johannes Schindelinci(visual-studio): actually run the tests in parallel
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-10-23 Johannes Schindelinci(visual-studio): use strict compile flags, and optimization
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-10-11 Johannes Schindelindoc(stash): clarify the description of `save`
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-10-09 Johannes Schindelinxdiffi: fix typos and touch up comments
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-10-06 Johannes Schindelinci: also build and test with MS Visual Studio on Azure...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-10-06 Johannes Schindelinci: really use shallow clones on Azure Pipelines
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-10-06 Johannes Schindelintests: let --immediate and --write-junit-xml play well...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-10-06 Johannes Schindelintest-tool run-command: learn to run (parts of) the...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-10-06 Johannes Schindelinvcxproj: include more generated files
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-10-06 Johannes Schindelinvcxproj: only copy `git-remote-http.exe` once it was...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-10-06 Johannes Schindelinmsvc: work around a bug in GetEnvironmentVariable()
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-10-06 Johannes Schindelinmsvc: handle DEVELOPER=1
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-10-06 Johannes Schindelinmsvc: ignore some libraries when linking
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-10-06 Johannes Schindelincompat/win32/path-utils.h: add #include guards
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-10-06 Johannes Schindelinwinansi: use FLEX_ARRAY to avoid compiler warning
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-10-06 Johannes Schindelinmsvc: avoid using minus operator on unsigned types
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-10-06 Johannes Schindelinstash apply: report status correctly even in a worktree...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-10-05 Johannes Schindelinfetch: let --jobs=<n> parallelize --multiple, too
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-10-03 Johannes Schindelinpush: do not pretend to return `int` from `die_push_simple()`
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-10-03 Johannes Schindelinrange-diff: internally force `diff.noprefix=true`
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-10-03 Johannes Schindelinci: run `hdr-check` as part of the `Static Analysis...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-10-02 Johannes Schindelindiffcore_rename(): use a stable sort
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-10-02 Johannes SchindelinMove git_sort(), a stable sort, into into libgit.a
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-09-24 Johannes SchindelinFix build with core.autocrlf=true
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-09-05 Johannes Schindelin.gitignore: stop ignoring `.manifest` files
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-08-26 Johannes Schindelinsetup_git_directory(): handle UNC root paths correctly
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-08-26 Johannes SchindelinFix .git/ discovery at the root of UNC shares
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-08-26 Johannes Schindelinsetup_git_directory(): handle UNC paths correctly
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-07-31 Johannes Schindelinconfig: work around bug with includeif:onbranch and...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-07-31 Johannes Schindelinrebase -r: do not (re-)generate root commits with ...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-07-31 Johannes Schindelint3418: test `rebase -r` with merge strategies
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-07-31 Johannes Schindelint/lib-rebase: prepare for testing `git rebase --rebase...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-07-31 Johannes Schindelinrebase -r: support merge strategies other than `recursive`
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-07-31 Johannes Schindelint3427: fix another incorrect assumption
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-07-31 Johannes Schindelint3427: accommodate for the `rebase --merge` backend...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-07-31 Johannes Schindelint3427: fix erroneous assumption
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-07-31 Johannes Schindelint3427: condense the unnecessarily repetitive test cases...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-07-31 Johannes Schindelint3427: move the `filter-branch` invocation into the...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-07-31 Johannes Schindelint3427: simplify the `setup` test case significantly
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-07-31 Johannes Schindelint3427: add a clarifying comment
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-07-31 Johannes Schindelinrebase: fold git-rebase--common into the -p backend
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-07-31 Johannes Schindelinsequencer: the `am` and `rebase--interactive` scripts...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-07-31 Johannes Schindelin.gitignore: there is no longer a built-in `git-rebase...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-07-31 Johannes Schindelint3400: stop referring to the scripted rebase
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-07-31 Johannes SchindelinDrop unused git-rebase--am.sh
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-07-29 Johannes Schindelingit: avoid calling aliased builtins via their dashed...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-07-29 Johannes Schindelinbin-wrappers: append `.exe` to target paths if necessary
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-07-29 Johannes Schindelin.gitignore: ignore Visual Studio's temporary/generated...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2019-07-29 Johannes Schindelinvcxproj: also link-or-copy builtins
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
next
git for Debian