1
0
mirror of https://github.com/git/git.git synced 2024-10-20 20:28:13 +02:00
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
Go to file
Alex Henrie 6605fb70cb rebase: add a config option for --rebase-merges
The purpose of the new option is to accommodate users who would like
--rebase-merges to be on by default and to facilitate turning on
--rebase-merges by default without configuration in a future version of
Git.

Name the new option rebase.rebaseMerges, even though it is a little
redundant, for consistency with the name of the command line option and
to be clear when scrolling through values in the [rebase] section of
.gitconfig.

Support setting rebase.rebaseMerges to the nonspecific value "true" for
users who don't need to or don't want to learn about the difference
between rebase-cousins and no-rebase-cousins.

Make --rebase-merges without an argument on the command line override
any value of rebase.rebaseMerges in the configuration, for consistency
with other command line flags with optional arguments that have an
associated config option.

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-03-27 09:32:49 -07:00
.github
block-sha1
builtin rebase: add a config option for --rebase-merges 2023-03-27 09:32:49 -07:00
ci
compat
contrib
Documentation rebase: add a config option for --rebase-merges 2023-03-27 09:32:49 -07:00
ewah
git-gui
gitk-git
gitweb
mergetools
negotiator Merge branch 'jk/unused-post-2.39-part2' 2023-03-17 14:03:09 -07:00
oss-fuzz
perl
po Merge branch 'fz/po-zh_CN' of github.com:fangyi-zhou/git-po 2023-03-10 22:50:14 +08:00
refs
reftable
sha1collisiondetection@855827c583
sha1dc
sha256
t rebase: add a config option for --rebase-merges 2023-03-27 09:32:49 -07:00
templates
trace2 dir.h: refactor to no longer need to include cache.h 2023-02-23 17:25:29 -08:00
xdiff
.cirrus.yml
.clang-format
.editorconfig
.gitattributes
.gitignore
.gitmodules
.mailmap
.tsan-suppressions
abspath.c bundle: don't blindly apply prefix_filename() to "-" 2023-03-06 13:12:56 -08:00
aclocal.m4
add-interactive.c
add-interactive.h
add-patch.c Merge branch 'jk/add-p-unmerged-fix' 2023-03-19 15:03:13 -07:00
advice.c Merge branch 'fc/advice-diverged-history' 2023-03-19 15:03:13 -07:00
advice.h Merge branch 'fc/advice-diverged-history' 2023-03-19 15:03:13 -07:00
alias.c
alias.h
alloc.c object.h: stop depending on cache.h; make cache.h depend on object.h 2023-02-23 17:25:29 -08:00
alloc.h
apply.c
apply.h
archive-tar.c
archive-zip.c
archive.c Merge branch 'en/header-cleanup' 2023-03-17 14:03:09 -07:00
archive.h
attr.c
attr.h
banned.h
base85.c
bisect.c
bisect.h
blame.c
blame.h object.h: stop depending on cache.h; make cache.h depend on object.h 2023-02-23 17:25:29 -08:00
blob.c object.h: stop depending on cache.h; make cache.h depend on object.h 2023-02-23 17:25:29 -08:00
blob.h
bloom.c
bloom.h
branch.c Merge branch 'rj/avoid-switching-to-already-used-branch' 2023-03-19 15:03:11 -07:00
branch.h
builtin.h
bulk-checkin.c
bulk-checkin.h
bundle-uri.c serve: use repository pointer to get config 2023-02-24 09:13:29 -08:00
bundle-uri.h
bundle.c
bundle.h
cache-tree.c
cache-tree.h object.h: stop depending on cache.h; make cache.h depend on object.h 2023-02-23 17:25:29 -08:00
cache.h Merge branch 'jk/bundle-use-dash-for-stdfiles' 2023-03-19 15:03:12 -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
commit-graph.h
commit-reach.c Merge branch 'ew/commit-reach-clean-up-flags-fix' 2023-03-19 15:03:10 -07:00
commit-reach.h
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c Merge branch 'jk/unused-post-2.39-part2' 2023-03-17 14:03:09 -07:00
commit.h
common-main.c
config.c replace-object.h: move read_replace_refs declaration from cache.h to here 2023-02-23 17:25:30 -08:00
config.h
config.mak.dev
config.mak.in
config.mak.uname
configure.ac
connect.c Merge branch 'zh/push-to-delete-onelevel-ref' 2023-03-19 15:03:10 -07:00
connect.h
connected.c
connected.h
convert.c
convert.h
copy.c
COPYING
credential.c Merge branch 'mc/credential-helper-www-authenticate' 2023-03-17 14:03:10 -07:00
credential.h Merge branch 'mc/credential-helper-www-authenticate' 2023-03-17 14:03:10 -07:00
csum-file.c
csum-file.h
ctype.c
daemon.c Merge branch 'jk/unused-post-2.39-part2' 2023-03-17 14:03:09 -07:00
date.c
date.h
decorate.c treewide: replace cache.h with more direct headers, where possible 2023-02-23 17:25:30 -08:00
decorate.h
delta-islands.c Merge branch 'en/header-cleanup' 2023-03-17 14:03:09 -07:00
delta-islands.h
delta.h
detect-compiler
diagnose.c Merge branch 'jk/unused-post-2.39-part2' 2023-03-17 14:03:09 -07:00
diagnose.h
diff-delta.c
diff-lib.c
diff-merges.c object.h: stop depending on cache.h; make cache.h depend on object.h 2023-02-23 17:25:29 -08:00
diff-merges.h
diff-no-index.c Remove unnecessary includes of builtin.h 2023-02-23 17:25:30 -08:00
diff.c Merge branch 'en/header-cleanup' 2023-03-17 14:03:09 -07:00
diff.h Merge branch 'en/header-cleanup' 2023-03-17 14:03:09 -07:00
diffcore-break.c
diffcore-delta.c object.h: stop depending on cache.h; make cache.h depend on object.h 2023-02-23 17:25:29 -08:00
diffcore-order.c treewide: replace cache.h with more direct headers, where possible 2023-02-23 17:25:30 -08:00
diffcore-pickaxe.c
diffcore-rename.c treewide: replace cache.h with more direct headers, where possible 2023-02-23 17:25:30 -08:00
diffcore-rotate.c treewide: replace cache.h with more direct headers, where possible 2023-02-23 17:25:30 -08:00
diffcore.h
dir-iterator.c Merge branch 'en/header-cleanup' 2023-03-17 14:03:09 -07:00
dir-iterator.h
dir.c Merge branch 'en/header-cleanup' 2023-03-17 14:03:09 -07:00
dir.h Merge branch 'en/header-cleanup' 2023-03-17 14:03:09 -07:00
editor.c
entry.c
entry.h
environment.c replace-object.h: move read_replace_refs declaration from cache.h to here 2023-02-23 17:25:30 -08:00
environment.h
exec-cmd.c
exec-cmd.h
fetch-negotiator.c
fetch-negotiator.h
fetch-pack.c Merge branch 'jk/unused-post-2.39-part2' 2023-03-17 14:03:09 -07:00
fetch-pack.h
fmt-merge-msg.c Merge branch 'jc/gpg-lazy-init' 2023-03-17 14:03:10 -07:00
fmt-merge-msg.h
fsck.c
fsck.h object.h: stop depending on cache.h; make cache.h depend on object.h 2023-02-23 17:25:29 -08:00
fsmonitor--daemon.h
fsmonitor-ipc.c
fsmonitor-ipc.h
fsmonitor-path-utils.h
fsmonitor-settings.c
fsmonitor-settings.h
fsmonitor.c
fsmonitor.h
generate-cmdlist.sh
generate-configlist.sh
generate-hooklist.sh
gettext.c
gettext.h
git-archimport.perl
git-compat-util.h Merge branch 'mc/credential-helper-www-authenticate' 2023-03-17 14:03:10 -07: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
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 Start the 2.41 cycle 2023-03-17 14:03:20 -07:00
git-web--browse.sh
git.c Merge branch 'en/header-cleanup' 2023-03-17 14:03:09 -07:00
git.rc
gpg-interface.c Merge branch 'jc/gpg-lazy-init' 2023-03-17 14:03:10 -07:00
gpg-interface.h
graph.c treewide: replace cache.h with more direct headers, where possible 2023-02-23 17:25:30 -08:00
graph.h
grep.c
grep.h
hash-lookup.c
hash-lookup.h
hash.h
hashmap.c
hashmap.h
help.c Merge branch 'jk/unused-post-2.39-part2' 2023-03-17 14:03:09 -07:00
help.h
hex.c
hex.h
hook.c Merge branch 'jk/unused-post-2.39-part2' 2023-03-17 14:03:09 -07:00
hook.h
http-backend.c Merge branch 'jk/unused-post-2.39-part2' 2023-03-17 14:03:09 -07:00
http-fetch.c
http-push.c
http-walker.c
http.c Merge branch 'mc/credential-helper-www-authenticate' 2023-03-17 14:03:10 -07:00
http.h
ident.c
ident.h
imap-send.c
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 Merge branch 'jk/unused-post-2.39-part2' 2023-03-17 14:03:09 -07:00
line-log.h
line-range.c
line-range.h
linear-assignment.c
linear-assignment.h
list-objects-filter-options.c
list-objects-filter-options.h object.h: stop depending on cache.h; make cache.h depend on object.h 2023-02-23 17:25:29 -08:00
list-objects-filter.c
list-objects-filter.h
list-objects.c
list-objects.h
list.h
ll-merge.c
ll-merge.h
lockfile.c
lockfile.h
log-tree.c Merge branch 'jk/unused-post-2.39-part2' 2023-03-17 14:03:09 -07:00
log-tree.h
ls-refs.c Merge branch 'jk/unused-post-2.39-part2' 2023-03-17 14:03:09 -07:00
ls-refs.h
mailinfo.c
mailinfo.h
mailmap.c
mailmap.h
Makefile
match-trees.c
mem-pool.c
mem-pool.h
merge-blobs.c object-store.h: move struct object_info from cache.h 2023-02-23 17:25:29 -08:00
merge-blobs.h
merge-ort-wrappers.c
merge-ort-wrappers.h
merge-ort.c
merge-ort.h
merge-recursive.c Remove unnecessary includes of builtin.h 2023-02-23 17:25:30 -08:00
merge-recursive.h
merge.c
mergesort.h
midx.c Merge branch 'jk/unused-post-2.39-part2' 2023-03-17 14:03:09 -07:00
midx.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c
notes-merge.h
notes-utils.c
notes-utils.h
notes.c Merge branch 'jk/unused-post-2.39-part2' 2023-03-17 14:03:09 -07:00
notes.h
object-file.c Merge branch 'jk/unused-post-2.39-part2' 2023-03-17 14:03:09 -07:00
object-name.c Merge branch 'jk/unused-post-2.39-part2' 2023-03-17 14:03:09 -07:00
object-store.h object-store.h: move struct object_info from cache.h 2023-02-23 17:25:29 -08:00
object.c
object.h object.h: stop depending on cache.h; make cache.h depend on object.h 2023-02-23 17:25:29 -08:00
oid-array.c
oid-array.h
oidmap.c
oidmap.h
oidset.c
oidset.h
oidtree.c
oidtree.h
pack-bitmap-write.c
pack-bitmap.c Merge branch 'jk/unused-post-2.39-part2' 2023-03-17 14:03:09 -07:00
pack-bitmap.h
pack-check.c
pack-mtimes.c
pack-mtimes.h
pack-objects.c
pack-objects.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
packfile.c Merge branch 'ds/reprepare-alternates-when-repreparing-packfiles' 2023-03-19 15:03:12 -07:00
packfile.h
pager.c
parallel-checkout.c
parallel-checkout.h
parse-options-cb.c
parse-options.c Merge branch 'jk/bundle-use-dash-for-stdfiles' 2023-03-19 15:03:12 -07:00
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c Merge branch 'jk/unused-post-2.39-part2' 2023-03-17 14:03:09 -07:00
path.h
pathspec.c
pathspec.h dir.h: refactor to no longer need to include cache.h 2023-02-23 17:25:29 -08:00
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Merge branch 'jk/unused-post-2.39-part2' 2023-03-17 14:03:09 -07:00
pretty.h
prio-queue.c
prio-queue.h
progress.c mark unused parameters in signal handlers 2023-02-24 09:13:30 -08:00
progress.h
promisor-remote.c
promisor-remote.h
prompt.c
prompt.h
protocol-caps.c object-store.h: move struct object_info from cache.h 2023-02-23 17:25:29 -08:00
protocol-caps.h
protocol.c
protocol.h
prune-packed.c
prune-packed.h
quote.c treewide: replace cache.h with more direct headers, where possible 2023-02-23 17:25:30 -08:00
quote.h
range-diff.c range-diff: avoid compiler warning when char is unsigned 2023-02-28 14:43:05 -08:00
range-diff.h
reachable.c Merge branch 'jk/unused-post-2.39-part2' 2023-03-17 14:03:09 -07:00
reachable.h
read-cache.c
README.md
rebase-interactive.c
rebase-interactive.h
rebase.c
rebase.h
ref-filter.c Merge branch 'jk/unused-post-2.39-part2' 2023-03-17 14:03:09 -07:00
ref-filter.h
reflog-walk.c
reflog-walk.h
reflog.c
reflog.h
refs.c Merge branch 'en/header-cleanup' 2023-03-17 14:03:09 -07:00
refs.h
refspec.c
refspec.h
RelNotes Start the 2.41 cycle 2023-03-17 14:03:20 -07:00
remote-curl.c
remote.c
remote.h
replace-object.c
replace-object.h replace-object.h: move read_replace_refs declaration from cache.h to here 2023-02-23 17:25:30 -08:00
repo-settings.c
repository.c
repository.h
rerere.c
rerere.h
reset.c
reset.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'ew/fetch-hiderefs' 2023-03-17 14:03:10 -07:00
revision.h
run-command.c run-command: mark error routine parameters as unused 2023-02-24 09:13:30 -08:00
run-command.h
scalar.c
SECURITY.md
send-pack.c Remove unnecessary includes of builtin.h 2023-02-23 17:25:30 -08:00
send-pack.h
sequencer.c Merge branch 'ab/fix-strategy-opts-parsing' 2023-03-19 15:03:12 -07:00
sequencer.h
serve.c Merge branch 'jk/unused-post-2.39-part2' 2023-03-17 14:03:09 -07:00
serve.h
server-info.c
setup.c
sh-i18n--envsubst.c
sha1dc_git.c treewide: replace cache.h with more direct headers, where possible 2023-02-23 17:25:30 -08:00
sha1dc_git.h
shallow.c
shallow.h object.h: stop depending on cache.h; make cache.h depend on object.h 2023-02-23 17:25:29 -08:00
shared.mak
shell.c
shortlog.h
sideband.c
sideband.h
sigchain.c
sigchain.h
simple-ipc.h
sparse-index.c
sparse-index.h
split-index.c
split-index.h
stable-qsort.c
statinfo.h dir.h: refactor to no longer need to include cache.h 2023-02-23 17:25:29 -08:00
strbuf.c
strbuf.h
streaming.c
streaming.h
string-list.c
string-list.h
strmap.c
strmap.h
strvec.c
strvec.h
sub-process.c
sub-process.h
submodule-config.c
submodule-config.h
submodule.c Merge branch 'jk/unused-post-2.39-part2' 2023-03-17 14:03:09 -07:00
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
trace2.c
trace2.h
trace.c
trace.h Merge branch 'en/header-cleanup' 2023-03-17 14:03:09 -07:00
trailer.c
trailer.h
transport-helper.c
transport-internal.h
transport.c
transport.h
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
tree.h
unicode-width.h
unimplemented.sh
unix-socket.c treewide: replace cache.h with more direct headers, where possible 2023-02-23 17:25:30 -08:00
unix-socket.h
unix-stream-server.c
unix-stream-server.h
unpack-trees.c Merge branch 'en/header-cleanup' 2023-03-17 14:03:09 -07:00
unpack-trees.h unpack-trees: add usage notices around df_conflict_entry 2023-02-27 08:29:51 -08:00
upload-pack.c Merge branch 'jk/unused-post-2.39-part2' 2023-03-17 14:03:09 -07:00
upload-pack.h
url.c treewide: replace cache.h with more direct headers, where possible 2023-02-23 17:25:30 -08:00
url.h
urlmatch.c treewide: replace cache.h with more direct headers, where possible 2023-02-23 17:25:30 -08:00
urlmatch.h
usage.c
userdiff.c Merge branch 'en/header-cleanup' 2023-03-17 14:03:09 -07: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 'rj/avoid-switching-to-already-used-branch' 2023-03-19 15:03:11 -07:00
worktree.h Merge branch 'rj/avoid-switching-to-already-used-branch' 2023-03-19 15:03:11 -07:00
wrap-for-bin.sh
wrapper.c
write-or-die.c
ws.c
wt-status.c
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