.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-CONFIG" "1" "07/05/2007" "Git 1.5.3.rc0.30.g114f" "Git Manual"
+.TH "GIT\-CONFIG" "1" "07/07/2007" "Git 1.5.3.rc0.63.gc956" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
gc.rerereunresolved
Records of conflicted merge you have not resolved are kept for this many days when git rerere gc is run. The default is 15 days. See \fBgit\-rerere\fR(1).
.TP
+rerere.enabled
+Activate recording of resolved conflicts, so that identical conflict hunks can be resolved automatically, should they be encountered again. See \fBgit\-rerere\fR(1).
+.TP
gitcvs.enabled
Whether the cvs server interface is enabled for this repository. See \fBgit\-cvsserver\fR(1).
.TP
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-RERERE" "1" "06/16/2007" "Git 1.5.2.2.236.g952c8" "Git Manual"
+.TH "GIT\-RERERE" "1" "07/07/2007" "Git 1.5.3.rc0.63.gc956" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.nr an-break-flag 1
.br
\fBNote\fR
-You need to create $GIT_DIR/rr\-cache directory to enable this command.
+You need to set the config variable rerere.enabled to enable this command.
.SH "COMMANDS"
Normally, git\-rerere is run without arguments or user\-intervention. However, it has several commands that allow it to interact with its working state.
.TP
Next time, running git\-rerere after seeing a conflicted automerge, if the conflict is the same as the earlier one recorded, it is noticed and a three\-way merge between the earlier conflicted automerge, the earlier manual resolution, and the current conflicted automerge is performed by the command. If this three\-way merge resolves cleanly, the result is written out to your working tree file, so you would not have to manually resolve it. Note that git\-rerere leaves the index file alone, so you still need to do the final sanity checks with git diff (or git diff \-c) and git add when you are satisfied.
-As a convenience measure, git\-merge automatically invokes git\-rerere when it exits with a failed automerge, which records it if it is a new conflict, or reuses the earlier hand resolve when it is not. git\-commit also invokes git\-rerere when recording a merge result. What this means is that you do not have to do anything special yourself (Note: you still have to create $GIT_DIR/rr\-cache directory to enable this command).
+As a convenience measure, git\-merge automatically invokes git\-rerere when it exits with a failed automerge, which records it if it is a new conflict, or reuses the earlier hand resolve when it is not. git\-commit also invokes git\-rerere when recording a merge result. What this means is that you do not have to do anything special yourself (Note: you still have to set the config variable rerere.enabled to enable this command).
In our example, when you did the test merge, the manual resolution is recorded, and it will be reused when you do the actual merge later with updated master and topic branch, as long as the earlier resolution is still applicable.
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-SUBMODULE" "1" "07/03/2007" "Git 1.5.3.rc0" "Git Manual"
+.TH "GIT\-SUBMODULE" "1" "07/07/2007" "Git 1.5.3.rc0.63.gc956" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.SH "NAME"
git\-submodule \- Initialize, update or inspect submodules
.SH "SYNOPSIS"
-\fIgit\-submodule\fR [\-\-quiet] [\-b branch] add <repository> [<path>] \fIgit\-submodule\fR [\-\-quiet] [\-\-cached] [status|init|update] [\-\-] [<path>\&...]
+.sp
+.nf
+\fIgit\-submodule\fR [\-\-quiet] [\-b branch] add <repository> [<path>]
+\fIgit\-submodule\fR [\-\-quiet] [\-\-cached] [status|init|update] [\-\-] [<path>\&...]
+.fi
.SH "COMMANDS"
.TP
add
Show the status of the submodules. This will print the SHA\-1 of the currently checked out commit for each submodule, along with the submodule path and the output of \fBgit\-describe\fR(1) for the SHA\-1. Each SHA\-1 will be prefixed with \- if the submodule is not initialized and + if the currently checked out submodule commit does not match the SHA\-1 found in the index of the containing repository. This command is the default command for git\-submodule.
.TP
init
-Initialize the submodules, i.e. register in .git/config each submodule path and url found in .gitmodules. The key used in git/config is submodule.$path.url. This command does not alter existing information in .git/config.
+Initialize the submodules, i.e. register in .git/config each submodule name and url found in .gitmodules. The key used in .git/config is submodule.$name.url. This command does not alter existing information in .git/config.
.TP
update
Update the registered submodules, i.e. clone missing submodules and checkout the commit specified in the index of the containing repository. This will make the submodules HEAD be detached.
<path>
Path to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths.
.SH "FILES"
-When initializing submodules, a .gitmodules file in the top\-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as $GIR_DIR/config. The key to each submodule url is "module.$path.url".
+When initializing submodules, a .gitmodules file in the top\-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as $GIR_DIR/config. The key to each submodule url is "submodule.$name.url".
.SH "AUTHOR"
Written by Lars Hjemli <hjemli@gmail.com>
.SH "GIT"
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT" "7" "07/04/2007" "Git 1.5.3.rc0.11.ge2b1a" "Git Manual"
+.TH "GIT" "7" "07/07/2007" "Git 1.5.3.rc0.63.gc956" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
Historical note. We did not have \-u facility when this section was first written, so we used to warn that the merge is done in the index file, not in your working tree, and your working tree will not match your index after this step. This is no longer true. The above command, thanks to \-u option, updates your working tree with the merge results for paths that have been trivially merged.
.SS "8) Merging multiple trees, continued"
-Sadly, many merges aren't trivial. If there are files that have been added.moved or removed, or if both branches have modified the same file, you will be left with an index tree that contains "merge entries" in it. Such an index tree can \fINOT\fR be written out to a tree object, and you will have to resolve any such merge clashes using other tools before you can write out the result.
+Sadly, many merges aren't trivial. If there are files that have been added, moved or removed, or if both branches have modified the same file, you will be left with an index tree that contains "merge entries" in it. Such an index tree can \fINOT\fR be written out to a tree object, and you will have to resolve any such merge clashes using other tools before you can write out the result.
You can examine such index state with git\-ls\-files \-\-unmerged command. An example:
.sp
projects / git.git / commitdiff