Find a file
Fernando Ramos f3d7623a13 vimdiff: make layout engine more robust against user vim settings
'vim' has two configuration options ('splitbelow' and 'splitright') that
change the way the 'split' command behaves. When they are set, the
commands that the layout engine generates no longer work as expected.

In order to fix this we can append special keyword 'leftabove' to each
'split' and 'vertical split' subcommand found inside the command string
generated by the layout engine.

This works because whatever comes after 'leftabove' will temporally
ignore settings 'splitbelow' and 'splitright'.

Reported-by: Matthew Klein <mklein994@gmail.com>
Signed-off-by: Fernando Ramos <greenfoo@u92.eu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-07-08 13:15:50 -07:00
.github
block-sha1
builtin Merge branch 'ds/partial-bundles' 2022-03-21 15:14:24 -07:00
ci
compat Merge branch 'pw/single-key-interactive' 2022-03-21 15:14:24 -07:00
contrib Merge branch 'ab/make-optim-noop' 2022-03-13 22:56:17 +00:00
Documentation vimdiff: add tool documentation 2022-04-03 15:09:52 -07:00
ewah
git-gui
gitk-git
gitweb gitweb: remove invalid http-equiv="content-type" 2022-03-08 10:10:16 -08:00
mergetools vimdiff: make layout engine more robust against user vim settings 2022-07-08 13:15:50 -07:00
negotiator
perl
po
ppc
refs refs/files-backend: optimize reading of symbolic refs 2022-03-01 10:13:46 -08:00
reftable reftable: rename writer_stats to reftable_writer_stats 2022-02-23 13:36:26 -08:00
sha1collisiondetection@855827c583
sha1dc
sha256
t vimdiff: integrate layout tests in the unit tests framework ('t' folder) 2022-03-30 13:15:42 -07:00
templates Makefile: add "$(QUIET)" boilerplate to shared.mak 2022-03-03 14:14:55 -08:00
trace2 trace2: use designated initializers for "struct tr2_dst" 2022-02-24 15:58:55 -08:00
xdiff
.cirrus.yml
.clang-format
.editorconfig
.gitattributes
.gitignore
.gitmodules
.mailmap
.tsan-suppressions
abspath.c
aclocal.m4
add-interactive.c Merge branch 'pw/single-key-interactive' 2022-03-21 15:14:24 -07:00
add-interactive.h
add-patch.c
advice.c switch: mention the --detach option when dying due to lack of a branch 2022-02-25 22:21:48 -08:00
advice.h switch: mention the --detach option when dying due to lack of a branch 2022-02-25 22:21:48 -08:00
alias.c
alias.h
alloc.c
alloc.h
apply.c Merge branch 'ab/object-file-api-updates' 2022-03-16 17:53:08 -07:00
apply.h range-diff: plug memory leak in common invocation 2022-03-04 13:24:19 -08:00
archive-tar.c archive-*.c: use designated initializers for "struct archiver" 2022-02-24 15:59:20 -08:00
archive-zip.c Merge branch 'ab/c99-designated-initializers' 2022-03-06 21:25:32 -08:00
archive.c
archive.h
attr.c
attr.h
banned.h C99: remove hardcoded-out !HAVE_VARIADIC_MACROS code 2022-02-21 19:14:19 -08:00
base85.c
bisect.c
bisect.h
blame.c Merge branch 'ab/diff-free-more' 2022-02-25 15:47:36 -08:00
blame.h
blob.c
blob.h
bloom.c
bloom.h
branch.c
branch.h
builtin.h
bulk-checkin.c object-file API: add a format_object_header() function 2022-02-25 17:16:31 -08:00
bulk-checkin.h
bundle.c Merge branch 'ds/partial-bundles' 2022-03-21 15:14:24 -07:00
bundle.h bundle: parse filter capability 2022-03-09 10:25:27 -08:00
cache-tree.c object-file API: have hash_object_file() take "enum object_type" 2022-02-25 17:16:32 -08:00
cache-tree.h
cache.h Merge branch 'ab/object-file-api-updates' 2022-03-16 17:53:08 -07:00
cbtree.c
cbtree.h
chdir-notify.c
chdir-notify.h
check-builtins.sh
checkout.c
checkout.h
chunk-format.c
chunk-format.h
CODE_OF_CONDUCT.md
color.c
color.h
column.c
column.h
combine-diff.c
command-list.txt
commit-graph.c Merge branch 'ab/string-list-count-in-size-t' 2022-03-16 17:53:09 -07:00
commit-graph.h commit-graph: fix memory leak in misused string_list API 2022-03-04 13:24:18 -08:00
commit-reach.c
commit-reach.h
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c Merge branch 'ab/racy-hooks' 2022-03-16 17:53:09 -07:00
commit.h hooks: fix an obscure TOCTOU "did we just run a hook?" race 2022-03-07 13:00:53 -08:00
common-main.c
config.c Merge branch 'en/present-despite-skipped' 2022-03-09 13:38:23 -08:00
config.h Merge branch 'ds/sparse-checkout-requires-per-worktree-config' 2022-02-25 15:47:33 -08:00
config.mak.dev
config.mak.in
config.mak.uname Makefile: add "$(QUIET)" boilerplate to shared.mak 2022-03-03 14:14:55 -08:00
configure.ac
connect.c
connect.h
connected.c
connected.h
convert.c Merge branch 'ab/object-file-api-updates' 2022-03-16 17:53:08 -07:00
convert.h
copy.c
COPYING
credential.c urlmatch.c: add and use a *_release() function 2022-03-04 13:24:18 -08:00
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c
date.h
decorate.c
decorate.h
delta-islands.c
delta-islands.h
delta.h
detect-compiler
diff-delta.c
diff-lib.c
diff-merges.c Merge branch 'ja/i18n-common-messages' 2022-02-25 15:47:35 -08:00
diff-merges.h
diff-no-index.c
diff.c Merge branch 'ab/plug-random-leaks' 2022-03-13 22:56:18 +00:00
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c object-file API: have hash_object_file() take "enum object_type" 2022-02-25 17:16:32 -08:00
diffcore-rotate.c
diffcore.h
dir-iterator.c
dir-iterator.h
dir.c Merge branch 'vd/sparse-read-tree' 2022-03-16 17:53:08 -07:00
dir.h
editor.c
entry.c
entry.h
environment.c repo_read_index: add config to expect files outside sparse patterns 2022-03-01 23:37:48 -08:00
environment.h
exec-cmd.c
exec-cmd.h
fetch-negotiator.c
fetch-negotiator.h
fetch-pack.c Merge branch 'ps/fetch-optim-with-commit-graph' 2022-02-23 16:58:03 -08:00
fetch-pack.h
fmt-merge-msg.c
fmt-merge-msg.h
fsck.c
fsck.h
fsmonitor.c
fsmonitor.h
fuzz-commit-graph.c
fuzz-pack-headers.c
fuzz-pack-idx.c
generate-cmdlist.sh
generate-configlist.sh
generate-hooklist.sh
gettext.c
gettext.h
git-add--interactive.perl
git-archimport.perl
git-bisect.sh
git-compat-util.h C99: remove hardcoded-out !HAVE_VARIADIC_MACROS code 2022-02-21 19:14:19 -08:00
git-curl-compat.h
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-filter-branch.sh
git-instaweb.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh vimdiff: add tool documentation 2022-04-03 15:09:52 -07:00
git-mergetool.sh
git-p4.py
git-quiltimport.sh
git-request-pull.sh
git-send-email.perl
git-sh-i18n.sh
git-sh-setup.sh
git-submodule.sh
git-svn.perl
GIT-VERSION-GEN
git-web--browse.sh
git.c Merge branch 'ab/grep-patterntype' 2022-02-25 15:47:36 -08:00
git.rc
gpg-interface.c Merge branch 'fs/gpgsm-update' 2022-03-13 22:56:17 +00:00
gpg-interface.h
graph.c
graph.h
grep.c Merge branch 'rs/pcre-invalid-utf8-fix-fix' 2022-02-25 15:47:38 -08:00
grep.h
hash-lookup.c
hash-lookup.h
hash.h
hashmap.c
hashmap.h
help.c help: don't print "\n" before single-section output 2022-02-23 13:41:37 -08:00
help.h help: add --no-[external-commands|aliases] for use with --all 2022-02-23 13:41:37 -08:00
hex.c
hook.c hooks: fix an obscure TOCTOU "did we just run a hook?" race 2022-03-07 13:00:53 -08:00
hook.h hooks: fix an obscure TOCTOU "did we just run a hook?" race 2022-03-07 13:00:53 -08:00
http-backend.c
http-fetch.c
http-push.c object-file API: add a format_object_header() function 2022-02-25 17:16:31 -08:00
http-walker.c
http.c
http.h
ident.c
imap-send.c imap-send.c: use designated initializers for "struct imap_server_conf" 2022-02-24 15:57:56 -08:00
INSTALL
iterator.h
json-writer.c
json-writer.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1
line-log.c
line-log.h
line-range.c
line-range.h
linear-assignment.c
linear-assignment.h
list-objects-filter-options.c bundle: parse filter capability 2022-03-09 10:25:27 -08:00
list-objects-filter-options.h bundle: parse filter capability 2022-03-09 10:25:27 -08:00
list-objects-filter.c
list-objects-filter.h
list-objects.c list-objects: handle NULL function pointers 2022-03-09 10:25:27 -08:00
list-objects.h list-objects: consolidate traverse_commit_list[_filtered] 2022-03-09 10:25:27 -08:00
list.h
ll-merge.c
ll-merge.h
lockfile.c
lockfile.h
log-tree.c Merge branch 'ab/object-file-api-updates' 2022-03-16 17:53:08 -07:00
log-tree.h
ls-refs.c
ls-refs.h
mailinfo.c
mailinfo.h
mailmap.c string-list API: change "nr" and "alloc" to "size_t" 2022-03-07 12:02:04 -08:00
mailmap.h
Makefile Merge branch 'jc/stash-drop' 2022-03-16 17:53:08 -07:00
match-trees.c object-file API: have write_object_file() take "enum object_type" 2022-02-25 17:16:31 -08:00
mem-pool.c
mem-pool.h
merge-blobs.c
merge-blobs.h
merge-ort-wrappers.c
merge-ort-wrappers.h
merge-ort.c Merge branch 'ab/string-list-count-in-size-t' 2022-03-16 17:53:09 -07:00
merge-ort.h
merge-recursive.c Merge branch 'ab/object-file-api-updates' 2022-03-16 17:53:08 -07:00
merge-recursive.h
merge.c
mergesort.c
mergesort.h
midx.c Merge branch 'tb/midx-no-bitmap-for-no-objects' 2022-02-18 13:53:30 -08:00
midx.h
name-hash.c
notes-cache.c object-file API: have write_object_file() take "enum object_type" 2022-02-25 17:16:31 -08:00
notes-cache.h
notes-merge.c Merge branch 'ab/diff-free-more' 2022-02-25 15:47:36 -08:00
notes-merge.h
notes-utils.c
notes-utils.h
notes.c object-file API: have write_object_file() take "enum object_type" 2022-02-25 17:16:31 -08:00
notes.h
object-file.c Merge branch 'ab/object-file-api-updates' 2022-03-16 17:53:08 -07:00
object-name.c Merge branch 'ab/date-mode-release' 2022-02-25 15:47:36 -08:00
object-store.h object-file API: have hash_object_file() take "enum object_type" 2022-02-25 17:16:32 -08:00
object.c object-file API: have hash_object_file() take "enum object_type" 2022-02-25 17:16:32 -08:00
object.h reflog: libify delete reflog function and helpers 2022-03-02 15:24:47 -08:00
oid-array.c
oid-array.h
oidmap.c
oidmap.h
oidset.c
oidset.h
oidtree.c
oidtree.h
pack-bitmap-write.c Merge branch 'ab/only-single-progress-at-once' 2022-02-25 15:47:35 -08:00
pack-bitmap.c list-objects: consolidate traverse_commit_list[_filtered] 2022-03-09 10:25:27 -08:00
pack-bitmap.h pack-bitmap: drop filter in prepare_bitmap_walk() 2022-03-09 10:25:27 -08:00
pack-check.c object-file API: have hash_object_file() take "enum object_type" 2022-02-25 17:16:32 -08:00
pack-objects.c
pack-objects.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
packfile.c
packfile.h
pager.c
parallel-checkout.c
parallel-checkout.h
parse-options-cb.c
parse-options.c Merge branch 'ja/i18n-common-messages' 2022-02-25 15:47:35 -08:00
parse-options.h Merge branch 'ja/i18n-common-messages' 2022-02-25 15:47:35 -08:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c
path.h repository.c: free the "path cache" in repo_clear() 2022-03-04 13:24:19 -08:00
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
pretty.c
pretty.h
prio-queue.c
prio-queue.h
progress.c
progress.h
promisor-remote.c
promisor-remote.h
prompt.c
prompt.h
protocol-caps.c
protocol-caps.h
protocol.c
protocol.h
prune-packed.c
prune-packed.h
quote.c
quote.h
range-diff.c range-diff: plug memory leak in read_patches() 2022-03-04 13:24:19 -08:00
range-diff.h
reachable.c pack-bitmap: drop filter in prepare_bitmap_walk() 2022-03-09 10:25:27 -08:00
reachable.h
read-cache.c Merge branch 'ab/object-file-api-updates' 2022-03-16 17:53:08 -07:00
README.md
rebase-interactive.c
rebase-interactive.h
rebase.c
rebase.h
ref-filter.c
ref-filter.h
reflog-walk.c
reflog-walk.h
reflog.c reflog: libify delete reflog function and helpers 2022-03-02 15:24:47 -08:00
reflog.h reflog: libify delete reflog function and helpers 2022-03-02 15:24:47 -08:00
refs.c Merge branch 'ps/fetch-mirror-optim' 2022-03-16 17:53:07 -07:00
refs.h Merge branch 'ps/fetch-atomic' 2022-03-13 22:56:16 +00:00
refspec.c refspec.c: use designated initializers for "struct refspec_item" 2022-02-24 15:59:53 -08:00
refspec.h
RelNotes
remote-curl.c remote-curl.c: free memory in cmd_main() 2022-03-04 13:24:18 -08:00
remote.c remote: read symbolic refs via refs_read_symbolic_ref() 2022-03-01 10:13:46 -08:00
remote.h
replace-object.c
replace-object.h
repo-settings.c
repository.c Merge branch 'ab/plug-random-leaks' 2022-03-13 22:56:18 +00:00
repository.h repository.c: free the "path cache" in repo_clear() 2022-03-04 13:24:19 -08:00
rerere.c
rerere.h
reset.c
reset.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'ds/partial-bundles' 2022-03-21 15:14:24 -07:00
revision.h revision: put object filter into struct rev_info 2022-03-09 10:25:26 -08:00
run-command.c
run-command.h
SECURITY.md
send-pack.c
send-pack.h
sequencer.c hooks: fix an obscure TOCTOU "did we just run a hook?" race 2022-03-07 13:00:53 -08:00
sequencer.h
serve.c
serve.h
server-info.c
setup.c
sh-i18n--envsubst.c
sha1dc_git.c
sha1dc_git.h
shallow.c
shallow.h
shared.mak Makefiles: add and use wildcard "mkdir -p" template 2022-03-03 14:14:55 -08:00
shell.c
shortlog.h
sideband.c
sideband.h
sigchain.c
sigchain.h
simple-ipc.h
sparse-index.c Merge branch 'en/present-despite-skipped' 2022-03-09 13:38:23 -08:00
sparse-index.h
split-index.c
split-index.h
stable-qsort.c
strbuf.c gettext API users: don't explicitly cast ngettext()'s "n" 2022-03-07 11:57:52 -08:00
strbuf.h
streaming.c
streaming.h
string-list.c
string-list.h string-list API: change "nr" and "alloc" to "size_t" 2022-03-07 12:02:04 -08:00
strmap.c
strmap.h
strvec.c
strvec.h
sub-process.c
sub-process.h
submodule-config.c Merge branch 'ja/i18n-common-messages' 2022-02-25 15:47:35 -08:00
submodule-config.h
submodule.c
submodule.h
symlinks.c
tag.c
tag.h
tar.h
tempfile.c
tempfile.h
thread-utils.c
thread-utils.h
tmp-objdir.c
tmp-objdir.h
trace.c C99: remove hardcoded-out !HAVE_VARIADIC_MACROS code 2022-02-21 19:14:19 -08:00
trace.h C99: remove hardcoded-out !HAVE_VARIADIC_MACROS code 2022-02-21 19:14:19 -08:00
trace2.c C99: remove hardcoded-out !HAVE_VARIADIC_MACROS code 2022-02-21 19:14:19 -08:00
trace2.h C99: remove hardcoded-out !HAVE_VARIADIC_MACROS code 2022-02-21 19:14:19 -08:00
trailer.c
trailer.h
transport-helper.c
transport-internal.h
transport.c transport: stop needlessly copying bundle header references 2022-03-04 13:24:18 -08:00
transport.h
tree-diff.c
tree-walk.c object-file API: pass an enum to read_object_with_reference() 2022-02-25 17:16:32 -08:00
tree-walk.h
tree.c
tree.h
unicode-width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unix-stream-server.c
unix-stream-server.h
unpack-trees.c Merge branch 'vd/sparse-read-tree' 2022-03-16 17:53:08 -07:00
unpack-trees.h
upload-pack.c upload-pack: look up "want" lines via commit-graph 2022-03-01 10:13:45 -08:00
upload-pack.h
url.c
url.h
urlmatch.c urlmatch.c: add and use a *_release() function 2022-03-04 13:24:18 -08:00
urlmatch.h urlmatch.c: add and use a *_release() function 2022-03-04 13:24:18 -08:00
usage.c C99: remove hardcoded-out !HAVE_VARIADIC_MACROS code 2022-02-21 19:14:19 -08:00
userdiff.c userdiff.c: use designated initializers for "struct userdiff_driver" 2022-02-24 15:59:27 -08:00
userdiff.h
utf8.c
utf8.h
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c
walker.h
wildmatch.c
wildmatch.h
worktree.c Merge branch 'ds/sparse-checkout-requires-per-worktree-config' 2022-02-25 15:47:33 -08:00
worktree.h
wrap-for-bin.sh
wrapper.c
write-or-die.c
ws.c
wt-status.c Merge branch 'ab/string-list-count-in-size-t' 2022-03-16 17:53:09 -07:00
wt-status.h
xdiff-interface.c
xdiff-interface.h
zlib.c

Build status

Git - fast, scalable, distributed revision control system

Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations and full access to internals.

Git is an Open Source project covered by the GNU General Public License version 2 (some parts of it are under different licenses, compatible with the GPLv2). It was originally written by Linus Torvalds with help of a group of hackers around the net.

Please read the file INSTALL for installation instructions.

Many Git online resources are accessible from https://git-scm.com/ including full documentation and Git related tools.

See Documentation/gittutorial.txt to get started, then see Documentation/giteveryday.txt for a useful minimum set of commands, and Documentation/git-<commandname>.txt for documentation of each command. If git has been correctly installed, then the tutorial can also be read with man gittutorial or git help tutorial, and the documentation of each command with man git-<commandname> or git help <commandname>.

CVS users may also want to read Documentation/gitcvs-migration.txt (man gitcvs-migration or git help cvs-migration if git is installed).

The user discussion and development of Git take place on the Git mailing list -- everyone is welcome to post bug reports, feature requests, comments and patches to git@vger.kernel.org (read Documentation/SubmittingPatches for instructions on patch submission and Documentation/CodingGuidelines).

Those wishing to help with error message, usage and informational message string translations (localization l10) should see po/README.md (a po file is a Portable Object file that holds the translations).

To subscribe to the list, send an email with just "subscribe git" in the body to majordomo@vger.kernel.org (not the Git list). The mailing list archives are available at https://lore.kernel.org/git/, http://marc.info/?l=git and other archival sites.

Issues which are security relevant should be disclosed privately to the Git Security mailing list git-security@googlegroups.com.

The maintainer frequently sends the "What's cooking" reports that list the current status of various development topics to the mailing list. The discussion following them give a good reference for project status, development direction and remaining tasks.

The name "git" was given by Linus Torvalds when he wrote the very first version. He described the tool as "the stupid content tracker" and the name as (depending on your mood):

  • random three-letter combination that is pronounceable, and not actually used by any common UNIX command. The fact that it is a mispronunciation of "get" may or may not be relevant.
  • stupid. contemptible and despicable. simple. Take your pick from the dictionary of slang.
  • "global information tracker": you're in a good mood, and it actually works for you. Angels sing, and a light suddenly fills the room.
  • "goddamn idiotic truckload of sh*t": when it breaks