global/git

mirror of https://github.com/git/git.git synced 2026-02-03 14:31:45 +00:00

Go to file

Johannes Schindelin 2ae7e33e0a fixup! Handle the branch.<name>.rebase value 'interactive'

This commit became obsolete when 'pull' became a builtin, and was
redone in a patch series to teach the builtin pull about
--rebase=interactive that has landed in upstream Git already.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

2016-01-26 17:01:34 +01:00

block-sha1

sha1: provide another level of indirection for the SHA-1 functions

2015-11-05 10:35:11 -08:00

builtin

fixup! fast-export: do not refer to non-existing marks

2016-01-05 15:02:07 +01:00

compat

fixup! mingw: move MSys2 specific environment tweaks to setup_windows_environment

2016-01-26 17:00:11 +01:00

contrib

fixup! Teach 'git pull' to handle --rebase=interactive

2016-01-26 17:01:34 +01:00

Documentation

fixup! Handle the branch.<name>.rebase value 'interactive'

2016-01-26 17:01:34 +01:00

ewah

…

git-gui

Merge pull request #492 from tomyy/issue-490

2016-01-05 14:51:02 +01:00

gitk-git

Merge 'gitk' into HEAD

2016-01-05 14:45:55 +01:00

gitweb

…

mergetools

…

perl

Merge pull request #246 from uecasm/patch-1

2016-01-05 14:46:11 +01:00

l10n: de.po: translate 68 new messages

2015-12-29 19:53:17 +01:00

ppc

sha1: provide another level of indirection for the SHA-1 functions

2015-11-05 10:35:11 -08:00

refs

Merge branch 'sg/lock-file-commit-error'

2015-12-11 10:40:55 -08:00

fixup! criss cross rename failure workaround

2016-01-26 16:59:58 +01:00

templates

…

vcs-svn

…

xdiff

…

.gitattributes

…

.gitignore

Support Vagrant: quick & easy Linux virtual machine setup

2016-01-05 14:45:33 +01:00

.mailmap

…

.travis.yml

Add Travis CI support

2015-11-28 12:11:12 -05:00

abspath.c

…

aclocal.m4

…

advice.c

…

advice.h

…

alias.c

…

alloc.c

…

archive-tar.c

…

archive-zip.c

…

archive.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

archive.h

…

argv-array.c

…

argv-array.h

…

attr.c

mingw: Suppress warning that <commit>:.gitattributes does not exist

2016-01-05 14:46:14 +01:00

attr.h

…

base85.c

…

bisect.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

bisect.h

…

blob.c

…

blob.h

…

branch.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

branch.h

…

builtin.h

…

bulk-checkin.c

…

bulk-checkin.h

…

bundle.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

bundle.h

…

cache-tree.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

cache-tree.h

…

cache.h

Win32: support long paths

2016-01-05 14:36:37 +01:00

check_bindir

…

check-builtins.sh

…

check-racy.c

…

color.c

…

color.h

…

column.c

…

column.h

…

combine-diff.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

command-list.txt

…

commit-slab.h

…

commit.c

Merge branch 'rs/pop-commit' into maint

2015-12-11 11:14:13 -08:00

commit.h

…

config.c

Windows: add support for a Windows-wide configuration

2016-01-05 14:45:43 +01:00

config.mak.in

…

config.mak.uname

Enable DEP and ASLR

2016-01-21 13:17:02 +01:00

configure.ac

Merge branch 'rc/configure-use-libs-when-checking-a-lib' into maint

2015-12-01 17:19:06 -05:00

connect.c

get_remote_heads: convert to struct object_id

2015-11-20 08:02:05 -05:00

connect.h

…

connected.c

…

connected.h

…

CONTRIBUTING.md

Add a Code of Conduct

2016-01-05 14:45:49 +01:00

convert.c

…

convert.h

…

copy.c

…

COPYING

…

credential-cache--daemon.c

credential-cache: new option to ignore sighup

2015-11-20 08:02:07 -05:00

credential-cache.c

…

credential-store.c

credential-store: don't pass strerror to die_errno()

2015-12-16 10:27:12 -08:00

credential.c

…

credential.h

…

csum-file.c

…

csum-file.h

…

ctype.c

…

daemon.c

Merge branch 'rs/daemon-plug-child-leak' into maint

2015-11-05 12:18:17 -08:00

date.c

…

decorate.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

decorate.h

…

delta.h

…

diff-delta.c

…

diff-lib.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

diff-no-index.c

…

diff.c

Merge branch 'tk/sigchain-unnecessary-post-tempfile'

2015-10-29 13:59:18 -07:00

diff.h

…

diffcore-break.c

…

diffcore-delta.c

…

diffcore-order.c

…

diffcore-pickaxe.c

…

diffcore-rename.c

…

diffcore.h

…

dir.c

Merge branch 'dt/name-hash-dir-entry-fix' into maint

2015-11-03 15:32:40 -08:00

dir.h

…

editor.c

…

entry.c

…

environment.c

Win32: support long paths

2016-01-05 14:36:37 +01:00

exec_cmd.c

…

exec_cmd.h

…

fast-import.c

Merge branch 'sg/lock-file-commit-error'

2015-12-11 10:40:55 -08:00

fetch-pack.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

fetch-pack.h

…

fmt-merge-msg.h

…

fsck.c

Merge branch 'bc/object-id'

2015-12-10 12:36:13 -08:00

fsck.h

…

generate-cmdlist.sh

…

gettext.c

gettext: always use UTF-8 on native Windows

2016-01-05 14:40:10 +01:00

gettext.h

…

git-add--interactive.perl

Allow add -p and add -i with a large number of files

2016-01-05 14:48:41 +01:00

git-archimport.perl

…

git-bisect.sh

…

git-compat-util.h

Provide a dirname() function when NO_LIBGEN_H=YesPlease

2016-01-06 16:01:44 +01:00

git-cvsexportcommit.perl

…

git-cvsimport.perl

…

git-cvsserver.perl

…

git-difftool--helper.sh

…

git-difftool.perl

difftool: ignore symbolic links in use_wt_file

2015-10-29 13:43:10 -07:00

git-filter-branch.sh

Merge branch 'jk/filter-branch-no-index'

2015-12-04 11:19:10 -08:00

git-instaweb.sh

…

git-merge-octopus.sh

Windows: make sure that merge-octopus only outputs LF line endings

2016-01-05 14:40:07 +01:00

git-merge-one-file.sh

merge: detect delete/modechange conflict

2015-10-26 14:49:31 -07:00

git-merge-resolve.sh

…

git-mergetool--lib.sh

…

git-mergetool.sh

…

git-p4.py

Merge branch 'sh/p4-multi-depot'

2015-12-28 13:58:58 -08:00

git-parse-remote.sh

…

git-quiltimport.sh

…

git-rebase--am.sh

…

git-rebase--interactive.sh

rebase -i: remember merge options beyond continue actions

2015-12-11 12:44:44 -08:00

git-rebase--merge.sh

…

git-rebase.sh

Merge branch 'jk/rebase-no-autostash' into maint

2015-12-08 14:05:01 -08:00

git-relink.perl

…

git-remote-testgit.sh

…

git-request-pull.sh

…

git-send-email.perl

Merge branch 'jk/send-email-ssl-errors'

2015-12-21 10:59:06 -08:00

git-sh-i18n.sh

…

git-sh-setup.sh

mingw: Fix submodule tests t7400, t7405, t7406

2016-01-05 14:43:02 +01:00

git-stash.sh

…

git-submodule.sh

mingw: Fix submodule tests t7400, t7405, t7406

2016-01-05 14:43:02 +01:00

git-svn.perl

…

GIT-VERSION-GEN

Git 2.7

2016-01-04 14:08:04 -08:00

git-web--browse.sh

…

git.c

…

git.rc

mingw: Embed a manifest to trick UAC into Doing The Right Thing

2016-01-05 14:40:00 +01:00

git.spec.in

…

gpg-interface.c

…

gpg-interface.h

…

graph.c

…

graph.h

…

grep.c

…

grep.h

…

hashmap.c

…

hashmap.h

…

help.c

help: correct behavior for is_executable on Windows

2016-01-05 14:43:16 +01:00

help.h

…

hex.c

…

http-backend.c

Convert struct object to object_id

2015-11-20 08:02:05 -05:00

http-fetch.c

…

http-push.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

http-walker.c

…

http.c

http: also treat config options sslCert and sslKey as paths

2016-01-05 14:36:42 +01:00

http.h

http.c: use CURLOPT_RANGE for range requests

2015-11-02 14:18:06 -08:00

ident.c

mingw: use domain information for default email

2016-01-05 14:50:52 +01:00

imap-send.c

Merge branch 'js/imap-send-curl-compilation-fix'

2015-10-30 13:06:58 -07:00

INSTALL

…

khash.h

…

kwset.c

…

kwset.h

…

levenshtein.c

…

levenshtein.h

…

LGPL-2.1

…

line-log.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

line-log.h

…

line-range.c

…

line-range.h

…

list-objects.c

Convert struct object to object_id

2015-11-20 08:02:05 -05:00

list-objects.h

…

ll-merge.c

Merge branch 'jk/war-on-sprintf'

2015-10-20 15:24:01 -07:00

ll-merge.h

…

lockfile.c

lockfile.c: use is_dir_sep() instead of hardcoded '/' checks

2016-01-05 14:45:13 +01:00

lockfile.h

…

log-tree.c

format-patch: add an option to suppress commit hash

2015-12-15 10:03:40 -08:00

log-tree.h

…

mailinfo.c

mailinfo: fix passing wrong address to git_mailinfo_config

2015-11-01 10:29:40 -08:00

mailinfo.h

mailinfo: remove calls to exit() and die() deep in the callchain

2015-10-21 15:59:34 -07:00

mailmap.c

…

mailmap.h

…

Makefile

Windows: force-recompile git.res for differing architectures

2016-01-05 14:52:10 +01:00

match-trees.c

…

merge-blobs.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

merge-blobs.h

…

merge-recursive.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

merge-recursive.h

…

merge.c

Convert struct object to object_id

2015-11-20 08:02:05 -05:00

mergesort.c

…

mergesort.h

…

name-hash.c

name-hash: don't reuse cache_entry in dir_entry

2015-10-21 12:47:38 -07:00

notes-cache.c

…

notes-cache.h

…

notes-merge.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

notes-merge.h

…

notes-utils.c

…

notes-utils.h

…

notes.c

…

notes.h

…

object.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

object.h

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

pack-bitmap-write.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

pack-bitmap.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

pack-bitmap.h

…

pack-check.c

verify_pack: do not ignore return value of verification function

2015-12-01 18:19:35 -05:00

pack-objects.c

…

pack-objects.h

…

pack-revindex.c

Silence GCC's "cast of pointer to integer of a different size" warning

2015-10-26 13:24:03 -07:00

pack-revindex.h

…

pack-write.c

…

pack.h

…

pager.c

…

parse-options-cb.c

…

parse-options.c

parse-options: allow -h as a short option

2015-11-20 08:02:07 -05:00

parse-options.h

parse-options: allow -h as a short option

2015-11-20 08:02:07 -05:00

patch-delta.c

…

patch-ids.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

patch-ids.h

…

path.c

Refactor skipping DOS drive prefixes

2016-01-06 14:58:59 +01:00

pathspec.c

…

pathspec.h

…

pkt-line.c

…

pkt-line.h

…

preload-index.c

add infrastructure for read-only file system level caches

2016-01-05 14:36:34 +01:00

pretty.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

prio-queue.c

…

prio-queue.h

…

progress.c

…

progress.h

…

prompt.c

…

prompt.h

…

quote.c

…

quote.h

…

reachable.c

Merge branch 'js/gc-with-stale-symref' into maint

2015-10-20 15:22:42 -07:00

reachable.h

…

read-cache.c

Merge branch 'dt/name-hash-dir-entry-fix' into maint

2015-11-03 15:32:40 -08:00

README

…

README.md

readme: added link to governance model

2016-01-05 14:43:19 +01:00

ref-filter.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

ref-filter.h

…

reflog-walk.c

…

reflog-walk.h

…

refs.c

Merge branch 'bc/object-id'

2015-12-10 12:36:13 -08:00

refs.h

hideRefs: add support for matching full refs

2015-11-05 11:25:02 -08:00

RelNotes

Prepare for 2.6.5

2015-12-11 11:17:47 -08:00

remote-curl.c

parse_fetch: convert to use struct object_id

2015-11-20 08:02:05 -05:00

remote-testsvn.c

…

remote.c

remote: convert functions to struct object_id

2015-11-20 08:02:05 -05:00

remote.h

ref_newer: convert to use struct object_id

2015-11-20 08:02:05 -05:00

replace_object.c

…

rerere.c

…

rerere.h

…

resolve-undo.c

…

resolve-undo.h

…

revision.c

Merge branch 'jk/pending-keep-tag-name' into maint

2016-01-04 14:03:08 -08:00

revision.h

format-patch: add an option to suppress commit hash

2015-12-15 10:03:40 -08:00

run-command.c

Merge branch 'rs/daemon-plug-child-leak' into maint

2015-11-05 12:18:17 -08:00

run-command.h

Merge branch 'rs/daemon-plug-child-leak' into maint

2015-11-05 12:18:17 -08:00

send-pack.c

Config option to disable side-band-64k for transport

2016-01-05 14:43:22 +01:00

send-pack.h

…

sequencer.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

sequencer.h

…

server-info.c

Convert struct object to object_id

2015-11-20 08:02:05 -05:00

setup.c

Merge branch 'mk/submodule-gitdir-path' into maint

2015-11-03 15:32:35 -08:00

sh-i18n--envsubst.c

…

sha1_file.c

Merge branch 'bc/format-patch-null-from-line'

2015-12-21 10:59:08 -08:00

sha1_name.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

sha1-array.c

…

sha1-array.h

…

sha1-lookup.c

…

sha1-lookup.h

…

shallow.c

Merge branch 'rs/pop-commit' into maint

2015-12-11 11:14:13 -08:00

shell.c

…

shortlog.h

…

show-index.c

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

sideband.c

…

sideband.h

…

sigchain.c

…

sigchain.h

…

split-index.c

…

split-index.h

…

strbuf.c

strbuf_readlink: support link targets that exceed PATH_MAX

2016-01-05 14:45:12 +01:00

strbuf.h

Merge branch 'tk/stripspace'

2015-10-26 15:55:20 -07:00

streaming.c

…

streaming.h

…

string-list.c

…

string-list.h

…

submodule-config.c

push: add recurseSubmodules config option

2015-11-20 08:02:07 -05:00

submodule-config.h

push: add recurseSubmodules config option

2015-11-20 08:02:07 -05:00

submodule.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

submodule.h

push: add recurseSubmodules config option

2015-11-20 08:02:07 -05:00

symlinks.c

…

tag.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

tag.h

…

tar.h

…

tempfile.c

…

tempfile.h

…

test-chmtime.c

…

test-config.c

…

test-ctype.c

…

test-date.c

…

test-delta.c

…

test-dump-cache-tree.c

…

test-dump-split-index.c

…

test-dump-untracked-cache.c

…

test-genrandom.c

…

test-hashmap.c

…

test-index-version.c

…

test-line-buffer.c

…

test-match-trees.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

test-mergesort.c

…

test-mktemp.c

…

test-parse-options.c

…

test-path-utils.c

t0060: verify that basename() and dirname() work as expected

2016-01-06 16:01:45 +01:00

test-prio-queue.c

…

test-read-cache.c

…

test-regex.c

…

test-revision-walking.c

…

test-run-command.c

…

test-scrap-cache-tree.c

…

test-sha1-array.c

…

test-sha1.c

…

test-sha1.sh

…

test-sigchain.c

…

test-string-list.c

…

test-submodule-config.c

…

test-subprocess.c

…

test-svn-fe.c

…

test-urlmatch-normalization.c

…

test-wildmatch.c

…

thread-utils.c

…

thread-utils.h

…

trace.c

…

trace.h

…

trailer.c

…

trailer.h

…

transport-helper.c

Always auto-gc after calling a fast-import transport

2016-01-05 14:43:07 +01:00

transport.c

Merge branch 'bc/object-id'

2015-12-10 12:36:13 -08:00

transport.h

Convert struct ref to use object_id.

2015-11-20 08:02:05 -05:00

tree-diff.c

…

tree-walk.c

…

tree-walk.h

…

tree.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

tree.h

…

unicode_width.h

…

unimplemented.sh

…

unix-socket.c

…

unix-socket.h

…

unpack-trees.c

…

unpack-trees.h

…

update_unicode.sh

…

upload-pack.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

url.c

…

url.h

…

urlmatch.c

…

urlmatch.h

…

usage.c

…

userdiff.c

…

userdiff.h

…

utf8.c

…

utf8.h

…

Vagrantfile

Support Vagrant: quick & easy Linux virtual machine setup

2016-01-05 14:45:33 +01:00

varint.c

…

varint.h

…

version.c

…

version.h

…

versioncmp.c

…

walker.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

walker.h

…

wildmatch.c

…

wildmatch.h

…

worktree.c

…

worktree.h

…

wrap-for-bin.sh

Facilitate debugging Git executables in tests with gdb

2015-12-10 19:40:10 +01:00

wrapper.c

Merge branch 'jk/ident-loosen-getpwuid'

2015-12-21 10:59:07 -08:00

write_or_die.c

…

ws.c

…

wt-status.c

Merge branch 'bc/object-id'

2015-12-10 12:36:13 -08:00

wt-status.h

…

xdiff-interface.c

…

xdiff-interface.h

…

zlib.c

…

README.md

Git for Windows

This is the source code of Git for Windows, forked from Git.

This project is run by a governance model. If you encounter problems, you can report them as GitHub issues, discuss them on Git for Windows' Google Group, and contribute bug fixes.

Languages

C 50.5%

Shell 38.7%

Perl 4.5%

Tcl 3.2%

Python 0.8%

Other 2.1%