Additional email headers to include in a patch to be submitted
by mail. See gitlink:git-format-patch[1].
+gc.reflogexpire::
+ `git reflog expire` removes reflog entries older than
+ this time; defaults to 90 days.
+
+gc.reflogexpireunreachable::
+ `git reflog expire` removes reflog entries older than
+ this time and are not reachable from the current tip;
+ defaults to 30 days.
+
+gc.rerereresolved::
+ Records of conflicted merge you resolved earlier are
+ kept for this many days when `git rerere gc` is run.
+ The default is 60 days. See gitlink:git-rerere[1].
+
+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 gitlink:git-rerere[1].
+
gitcvs.enabled::
Whether the cvs pserver interface is enabled for this repository.
See gitlink:git-cvsserver[1].
<ol>\r
<li>\r
<p>\r
-running without "—full" is usually cheap and assures the\r
+running without <tt>--full</tt> is usually cheap and assures the\r
repository health reasonably well.\r
</p>\r
</li>\r
</li>\r
<li>\r
<p>\r
-without "-a" repacks incrementally. repacking every 4-5MB\r
+without <tt>-a</tt> repacks incrementally. repacking every 4-5MB\r
of loose objects accumulation may be a good rule of thumb.\r
</p>\r
</li>\r
</li>\r
<li>\r
<p>\r
-<a href="git-add.html">git-add(1)</a> and <a href="git-update-index.html">git-update-index(1)</a> to manage\r
- the index file.\r
+<a href="git-add.html">git-add(1)</a> to manage the index file.\r
</p>\r
</li>\r
<li>\r
</li>\r
<li>\r
<p>\r
-<a href="git-pull.html">git-pull(1)</a> with "." as the remote to merge between\r
- local branches.\r
+<a href="git-merge.html">git-merge(1)</a> to merge between local branches.\r
</p>\r
</li>\r
<li>\r
</li>\r
</ul>\r
<h3>Examples</h3>\r
-<p>Use a tarball as a starting point for a new repository:</p>\r
-<p>+</p>\r
+<dl>\r
+<dt>\r
+Use a tarball as a starting point for a new repository.\r
+</dt>\r
+<dd>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt>$ tar zxf frotz.tar.gz\r
$ git commit -m 'import of frotz source tree.'\r
$ git tag v2.43 <b>(2)</b></tt></pre>\r
</div></div>\r
-<p>+\r
-<1> add everything under the current directory.\r
-<2> make a lightweight, unannotated tag.</p>\r
-<dl>\r
+<ol>\r
+<li>\r
+<p>\r
+add everything under the current directory.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+make a lightweight, unannotated tag.\r
+</p>\r
+</li>\r
+</ol>\r
+</dd>\r
<dt>\r
Create a topic branch and develop.\r
</dt>\r
$ git checkout -- curses/ux_audio_oss.c <b>(2)</b>\r
$ git add curses/ux_audio_alsa.c <b>(3)</b>\r
$ edit/compile/test\r
-$ git diff <b>(4)</b>\r
+$ git diff HEAD <b>(4)</b>\r
$ git commit -a -s <b>(5)</b>\r
$ edit/compile/test\r
$ git reset --soft HEAD^ <b>(6)</b>\r
$ git diff ORIG_HEAD <b>(7)</b>\r
$ git commit -a -c ORIG_HEAD <b>(8)</b>\r
$ git checkout master <b>(9)</b>\r
-$ git pull . alsa-audio <b>(10)</b>\r
+$ git merge alsa-audio <b>(10)</b>\r
$ git log --since='3 days ago' <b>(11)</b>\r
$ git log v2.43.. curses/ <b>(12)</b></tt></pre>\r
</div></div>\r
</li>\r
<li>\r
<p>\r
-revert your botched changes in "curses/ux_audio_oss.c".\r
+revert your botched changes in <tt>curses/ux_audio_oss.c</tt>.\r
</p>\r
</li>\r
<li>\r
<p>\r
you need to tell git if you added a new file; removal and\r
-modification will be caught if you do "commit -a" later.\r
+modification will be caught if you do <tt>git commit -a</tt> later.\r
</p>\r
</li>\r
<li>\r
</li>\r
<li>\r
<p>\r
-merge a topic branch into your master branch\r
+merge a topic branch into your master branch. You can also use\r
+<tt>git pull . alsa-audio</tt>, i.e. pull from the local repository.\r
</p>\r
</li>\r
<li>\r
<p>\r
review commit logs; other forms to limit output can be\r
-combined and include —max-count=10 (show 10 commits), —until=<em>2005-12-10</em>.\r
+combined and include <tt>--max-count=10</tt> (show 10 commits),\r
+<tt>--until=2005-12-10</tt>, etc.\r
</p>\r
</li>\r
<li>\r
<p>\r
-view only the changes that touch what's in curses/\r
-directory, since v2.43 tag.\r
+view only the changes that touch what's in <tt>curses/</tt>\r
+directory, since <tt>v2.43</tt> tag.\r
</p>\r
</li>\r
</ol>\r
</li>\r
<li>\r
<p>\r
-"pull" fetches from "origin" by default and merges into the\r
+<tt>git pull</tt> fetches from <tt>origin</tt> by default and merges into the\r
current branch.\r
</p>\r
</li>\r
</li>\r
<li>\r
<p>\r
-from time to time, obtain official tags from the "origin"\r
-and store them under .git/refs/tags/.\r
+from time to time, obtain official tags from the <tt>origin</tt>\r
+and store them under <tt>.git/refs/tags/</tt>.\r
</p>\r
</li>\r
</ol>\r
<dd>\r
<div class="listingblock">\r
<div class="content">\r
-<pre><tt>satellite$ git clone mothership:frotz/.git frotz <b>(1)</b>\r
+<pre><tt>satellite$ git clone mothership:frotz frotz <b>(1)</b>\r
satellite$ cd frotz\r
-satellite$ cat .git/remotes/origin <b>(2)</b>\r
-URL: mothership:frotz/.git\r
-Pull: master:origin\r
-satellite$ echo 'Push: master:satellite' >>.git/remotes/origin <b>(3)</b>\r
+satellite$ git repo-config --get-regexp '^(remote|branch)\.' <b>(2)</b>\r
+remote.origin.url mothership:frotz\r
+remote.origin.fetch refs/heads/*:refs/remotes/origin/*\r
+branch.master.remote origin\r
+branch.master.merge refs/heads/master\r
+satellite$ git repo-config remote.origin.push \\r
+ master:refs/remotes/satellite/master <b>(3)</b>\r
satellite$ edit/compile/test/commit\r
satellite$ git push origin <b>(4)</b>\r
\r
mothership$ cd frotz\r
mothership$ git checkout master\r
-mothership$ git pull . satellite <b>(5)</b></tt></pre>\r
+mothership$ git merge satellite/master <b>(5)</b></tt></pre>\r
</div></div>\r
<ol>\r
<li>\r
</li>\r
<li>\r
<p>\r
-clone creates this file by default. It arranges "git pull"\r
-to fetch and store the master branch head of mothership machine\r
-to local "origin" branch.\r
+clone sets these configuration variables by default.\r
+It arranges <tt>git pull</tt> to fetch and store the branches of mothership\r
+machine to local <tt>remotes/origin/*</tt> tracking branches.\r
</p>\r
</li>\r
<li>\r
<p>\r
-arrange "git push" to push local "master" branch to\r
-"satellite" branch of the mothership machine.\r
+arrange <tt>git push</tt> to push local <tt>master</tt> branch to\r
+<tt>remotes/satellite/master</tt> branch of the mothership machine.\r
</p>\r
</li>\r
<li>\r
<p>\r
-push will stash our work away on "satellite" branch on the\r
-mothership machine. You could use this as a back-up method.\r
+push will stash our work away on <tt>remotes/satellite/master</tt>\r
+tracking branch on the mothership machine. You could use this as\r
+a back-up method.\r
</p>\r
</li>\r
<li>\r
</li>\r
<li>\r
<p>\r
-forward port all changes in private2.6.14 branch to master branch\r
+forward port all changes in <tt>private2.6.14</tt> branch to <tt>master</tt> branch\r
without a formal "merging".\r
</p>\r
</li>\r
& s 2 3 4 5 ./+to-apply\r
& s 7 8 ./+hold-linus\r
& q\r
-$ git checkout master\r
+$ git checkout -b topic/one master\r
$ git am -3 -i -s -u ./+to-apply <b>(4)</b>\r
$ compile/test\r
$ git checkout -b hold/linus && git am -3 -i -s -u ./+hold-linus <b>(5)</b>\r
$ git checkout topic/one && git rebase master <b>(6)</b>\r
-$ git checkout pu && git reset --hard master <b>(7)</b>\r
-$ git pull . topic/one topic/two && git pull . hold/linus <b>(8)</b>\r
+$ git checkout pu && git reset --hard next <b>(7)</b>\r
+$ git merge topic/one topic/two && git merge hold/linus <b>(8)</b>\r
$ git checkout maint\r
$ git cherry-pick master~4 <b>(9)</b>\r
$ compile/test\r
</li>\r
<li>\r
<p>\r
-restart "pu" every time from the master.\r
+restart <tt>pu</tt> every time from the next.\r
</p>\r
</li>\r
<li>\r
<li>\r
<p>\r
make sure I did not accidentally rewind master beyond what I\r
-already pushed out. "ko" shorthand points at the repository I have\r
+already pushed out. <tt>ko</tt> shorthand points at the repository I have\r
at kernel.org, and looks like this:\r
</p>\r
<div class="listingblock">\r
<pre><tt>$ cat .git/remotes/ko\r
URL: kernel.org:/pub/scm/git/git.git\r
Pull: master:refs/tags/ko-master\r
+Pull: next:refs/tags/ko-next\r
Pull: maint:refs/tags/ko-maint\r
Push: master\r
+Push: next\r
Push: +pu\r
Push: maint</tt></pre>\r
</div></div>\r
-<p>In the output from "git show-branch", "master" should have\r
-everything "ko-master" has.</p>\r
+<p>In the output from <tt>git show-branch</tt>, <tt>master</tt> should have\r
+everything <tt>ko-master</tt> has, and <tt>next</tt> should have\r
+everything <tt>ko-next</tt> has.</p>\r
</li>\r
<li>\r
<p>\r
<li>\r
<p>\r
log-in shell is set to /usr/bin/git-shell, which does not\r
-allow anything but "git push" and "git pull". The users should\r
+allow anything but <tt>git push</tt> and <tt>git pull</tt>. The users should\r
get an ssh access to the machine.\r
</p>\r
</li>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Oct-2006 09:29:03 UTC\r
+Last updated 27-Dec-2006 10:59:46 UTC\r
</div>\r
</div>\r
</body>\r
$ git prune <4>
------------
+
-<1> running without "--full" is usually cheap and assures the
+<1> running without `\--full` is usually cheap and assures the
repository health reasonably well.
<2> check how many loose objects there are and how much
disk space is wasted by not repacking.
-<3> without "-a" repacks incrementally. repacking every 4-5MB
+<3> without `-a` repacks incrementally. repacking every 4-5MB
of loose objects accumulation may be a good rule of thumb.
<4> after repack, prune removes the duplicate loose objects.
* gitlink:git-checkout[1] and gitlink:git-branch[1] to switch
branches.
- * gitlink:git-add[1] and gitlink:git-update-index[1] to manage
- the index file.
+ * gitlink:git-add[1] to manage the index file.
* gitlink:git-diff[1] and gitlink:git-status[1] to see what
you are in the middle of doing.
* gitlink:git-reset[1] and gitlink:git-checkout[1] (with
pathname parameters) to undo changes.
- * gitlink:git-pull[1] with "." as the remote to merge between
- local branches.
+ * gitlink:git-merge[1] to merge between local branches.
* gitlink:git-rebase[1] to maintain topic branches.
Examples
~~~~~~~~
-Use a tarball as a starting point for a new repository:
+Use a tarball as a starting point for a new repository.::
+
------------
$ tar zxf frotz.tar.gz
$ git checkout -- curses/ux_audio_oss.c <2>
$ git add curses/ux_audio_alsa.c <3>
$ edit/compile/test
-$ git diff <4>
+$ git diff HEAD <4>
$ git commit -a -s <5>
$ edit/compile/test
$ git reset --soft HEAD^ <6>
$ git diff ORIG_HEAD <7>
$ git commit -a -c ORIG_HEAD <8>
$ git checkout master <9>
-$ git pull . alsa-audio <10>
+$ git merge alsa-audio <10>
$ git log --since='3 days ago' <11>
$ git log v2.43.. curses/ <12>
------------
+
<1> create a new topic branch.
-<2> revert your botched changes in "curses/ux_audio_oss.c".
+<2> revert your botched changes in `curses/ux_audio_oss.c`.
<3> you need to tell git if you added a new file; removal and
-modification will be caught if you do "commit -a" later.
+modification will be caught if you do `git commit -a` later.
<4> to see what changes you are committing.
<5> commit everything as you have tested, with your sign-off.
<6> take the last commit back, keeping what is in the working tree.
<8> redo the commit undone in the previous step, using the message
you originally wrote.
<9> switch to the master branch.
-<10> merge a topic branch into your master branch
+<10> merge a topic branch into your master branch. You can also use
+`git pull . alsa-audio`, i.e. pull from the local repository.
<11> review commit logs; other forms to limit output can be
-combined and include --max-count=10 (show 10 commits), --until='2005-12-10'.
-<12> view only the changes that touch what's in curses/
-directory, since v2.43 tag.
+combined and include `\--max-count=10` (show 10 commits),
+`\--until=2005-12-10`, etc.
+<12> view only the changes that touch what's in `curses/`
+directory, since `v2.43` tag.
Individual Developer (Participant)[[Individual Developer (Participant)]]
+
<1> repeat as needed.
<2> extract patches from your branch for e-mail submission.
-<3> "pull" fetches from "origin" by default and merges into the
+<3> `git pull` fetches from `origin` by default and merges into the
current branch.
<4> immediately after pulling, look at the changes done upstream
since last time we checked, only in the
<5> fetch from a specific branch from a specific repository and merge.
<6> revert the pull.
<7> garbage collect leftover objects from reverted pull.
-<8> from time to time, obtain official tags from the "origin"
-and store them under .git/refs/tags/.
+<8> from time to time, obtain official tags from the `origin`
+and store them under `.git/refs/tags/`.
Push into another repository.::
+
------------
-satellite$ git clone mothership:frotz/.git frotz <1>
+satellite$ git clone mothership:frotz frotz <1>
satellite$ cd frotz
-satellite$ cat .git/remotes/origin <2>
-URL: mothership:frotz/.git
-Pull: master:origin
-satellite$ echo 'Push: master:satellite' >>.git/remotes/origin <3>
+satellite$ git repo-config --get-regexp '^(remote|branch)\.' <2>
+remote.origin.url mothership:frotz
+remote.origin.fetch refs/heads/*:refs/remotes/origin/*
+branch.master.remote origin
+branch.master.merge refs/heads/master
+satellite$ git repo-config remote.origin.push \
+ master:refs/remotes/satellite/master <3>
satellite$ edit/compile/test/commit
satellite$ git push origin <4>
mothership$ cd frotz
mothership$ git checkout master
-mothership$ git pull . satellite <5>
+mothership$ git merge satellite/master <5>
------------
+
<1> mothership machine has a frotz repository under your home
directory; clone from it to start a repository on the satellite
machine.
-<2> clone creates this file by default. It arranges "git pull"
-to fetch and store the master branch head of mothership machine
-to local "origin" branch.
-<3> arrange "git push" to push local "master" branch to
-"satellite" branch of the mothership machine.
-<4> push will stash our work away on "satellite" branch on the
-mothership machine. You could use this as a back-up method.
+<2> clone sets these configuration variables by default.
+It arranges `git pull` to fetch and store the branches of mothership
+machine to local `remotes/origin/*` tracking branches.
+<3> arrange `git push` to push local `master` branch to
+`remotes/satellite/master` branch of the mothership machine.
+<4> push will stash our work away on `remotes/satellite/master`
+tracking branch on the mothership machine. You could use this as
+a back-up method.
<5> on mothership machine, merge the work done on the satellite
machine into the master branch.
+
<1> create a private branch based on a well known (but somewhat behind)
tag.
-<2> forward port all changes in private2.6.14 branch to master branch
+<2> forward port all changes in `private2.6.14` branch to `master` branch
without a formal "merging".
& s 2 3 4 5 ./+to-apply
& s 7 8 ./+hold-linus
& q
-$ git checkout master
+$ git checkout -b topic/one master
$ git am -3 -i -s -u ./+to-apply <4>
$ compile/test
$ git checkout -b hold/linus && git am -3 -i -s -u ./+hold-linus <5>
$ git checkout topic/one && git rebase master <6>
-$ git checkout pu && git reset --hard master <7>
-$ git pull . topic/one topic/two && git pull . hold/linus <8>
+$ git checkout pu && git reset --hard next <7>
+$ git merge topic/one topic/two && git merge hold/linus <8>
$ git checkout maint
$ git cherry-pick master~4 <9>
$ compile/test
that are not quite ready.
<4> apply them, interactively, with my sign-offs.
<5> create topic branch as needed and apply, again with my
-sign-offs.
+sign-offs.
<6> rebase internal topic branch that has not been merged to the
master, nor exposed as a part of a stable branch.
-<7> restart "pu" every time from the master.
+<7> restart `pu` every time from the next.
<8> and bundle topic branches still cooking.
<9> backport a critical fix.
<10> create a signed tag.
<11> make sure I did not accidentally rewind master beyond what I
-already pushed out. "ko" shorthand points at the repository I have
+already pushed out. `ko` shorthand points at the repository I have
at kernel.org, and looks like this:
+
------------
$ cat .git/remotes/ko
URL: kernel.org:/pub/scm/git/git.git
Pull: master:refs/tags/ko-master
+Pull: next:refs/tags/ko-next
Pull: maint:refs/tags/ko-maint
Push: master
+Push: next
Push: +pu
Push: maint
------------
+
-In the output from "git show-branch", "master" should have
-everything "ko-master" has.
+In the output from `git show-branch`, `master` should have
+everything `ko-master` has, and `next` should have
+everything `ko-next` has.
<12> push out the bleeding edge.
<13> push the tag out, too.
------------
+
<1> log-in shell is set to /usr/bin/git-shell, which does not
-allow anything but "git push" and "git pull". The users should
+allow anything but `git push` and `git pull`. The users should
get an ssh access to the machine.
<2> in many distributions /etc/shells needs to list what is used
as the login shell.
<p>\r
In addition to the number of loose objects and disk\r
space consumed, it reports the number of in-pack\r
- objects, and number of objects that can be removed by\r
- running <tt>git-prune-packed</tt>.\r
+ objects, number of packs, and number of objects that can be\r
+ removed by running <tt>git-prune-packed</tt>.\r
</p>\r
</dd>\r
</dl>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 03-Oct-2006 08:40:58 UTC\r
+Last updated 27-Dec-2006 10:59:42 UTC\r
</div>\r
</div>\r
</body>\r
-v::
In addition to the number of loose objects and disk
space consumed, it reports the number of in-pack
- objects, and number of objects that can be removed by
- running `git-prune-packed`.
+ objects, number of packs, and number of objects that can be
+ removed by running `git-prune-packed`.
Author
--- /dev/null
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"\r
+ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">\r
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
+<head>\r
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
+<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<style type="text/css">\r
+/* Debug borders */\r
+p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
+/*\r
+ border: 1px solid red;\r
+*/\r
+}\r
+\r
+body {\r
+ margin: 1em 5% 1em 5%;\r
+}\r
+\r
+a { color: blue; }\r
+a:visited { color: fuchsia; }\r
+\r
+em {\r
+ font-style: italic;\r
+}\r
+\r
+strong {\r
+ font-weight: bold;\r
+}\r
+\r
+tt {\r
+ color: navy;\r
+}\r
+\r
+h1, h2, h3, h4, h5, h6 {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ margin-top: 1.2em;\r
+ margin-bottom: 0.5em;\r
+ line-height: 1.3;\r
+}\r
+\r
+h1 {\r
+ border-bottom: 2px solid silver;\r
+}\r
+h2 {\r
+ border-bottom: 2px solid silver;\r
+ padding-top: 0.5em;\r
+}\r
+\r
+div.sectionbody {\r
+ font-family: serif;\r
+ margin-left: 0;\r
+}\r
+\r
+hr {\r
+ border: 1px solid silver;\r
+}\r
+\r
+p {\r
+ margin-top: 0.5em;\r
+ margin-bottom: 0.5em;\r
+}\r
+\r
+pre {\r
+ padding: 0;\r
+ margin: 0;\r
+}\r
+\r
+span#author {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-weight: bold;\r
+ font-size: 1.2em;\r
+}\r
+span#email {\r
+}\r
+span#revision {\r
+ font-family: sans-serif;\r
+}\r
+\r
+div#footer {\r
+ font-family: sans-serif;\r
+ font-size: small;\r
+ border-top: 2px solid silver;\r
+ padding-top: 0.5em;\r
+ margin-top: 4.0em;\r
+}\r
+div#footer-text {\r
+ float: left;\r
+ padding-bottom: 0.5em;\r
+}\r
+div#footer-badges {\r
+ float: right;\r
+ padding-bottom: 0.5em;\r
+}\r
+\r
+div#preamble,\r
+div.tableblock, div.imageblock, div.exampleblock, div.verseblock,\r
+div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,\r
+div.admonitionblock {\r
+ margin-right: 10%;\r
+ margin-top: 1.5em;\r
+ margin-bottom: 1.5em;\r
+}\r
+div.admonitionblock {\r
+ margin-top: 2.5em;\r
+ margin-bottom: 2.5em;\r
+}\r
+\r
+div.content { /* Block element content. */\r
+ padding: 0;\r
+}\r
+\r
+/* Block element titles. */\r
+div.title, caption.title {\r
+ font-family: sans-serif;\r
+ font-weight: bold;\r
+ text-align: left;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.5em;\r
+}\r
+div.title + * {\r
+ margin-top: 0;\r
+}\r
+\r
+td div.title:first-child {\r
+ margin-top: 0.0em;\r
+}\r
+div.content div.title:first-child {\r
+ margin-top: 0.0em;\r
+}\r
+div.content + div.title {\r
+ margin-top: 0.0em;\r
+}\r
+\r
+div.sidebarblock > div.content {\r
+ background: #ffffee;\r
+ border: 1px solid silver;\r
+ padding: 0.5em;\r
+}\r
+\r
+div.listingblock > div.content {\r
+ border: 1px solid silver;\r
+ background: #f4f4f4;\r
+ padding: 0.5em;\r
+}\r
+\r
+div.quoteblock > div.content {\r
+ padding-left: 2.0em;\r
+}\r
+div.quoteblock .attribution {\r
+ text-align: right;\r
+}\r
+\r
+div.admonitionblock .icon {\r
+ vertical-align: top;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ text-decoration: underline;\r
+ color: #527bbd;\r
+ padding-right: 0.5em;\r
+}\r
+div.admonitionblock td.content {\r
+ padding-left: 0.5em;\r
+ border-left: 2px solid silver;\r
+}\r
+\r
+div.exampleblock > div.content {\r
+ border-left: 2px solid silver;\r
+ padding: 0.5em;\r
+}\r
+\r
+div.verseblock div.content {\r
+ white-space: pre;\r
+}\r
+\r
+div.imageblock div.content { padding-left: 0; }\r
+div.imageblock img { border: 1px solid silver; }\r
+span.image img { border-style: none; }\r
+\r
+dl {\r
+ margin-top: 0.8em;\r
+ margin-bottom: 0.8em;\r
+}\r
+dt {\r
+ margin-top: 0.5em;\r
+ margin-bottom: 0;\r
+ font-style: italic;\r
+}\r
+dd > *:first-child {\r
+ margin-top: 0;\r
+}\r
+\r
+ul, ol {\r
+ list-style-position: outside;\r
+}\r
+ol.olist2 {\r
+ list-style-type: lower-alpha;\r
+}\r
+\r
+div.tableblock > table {\r
+ border-color: #527bbd;\r
+ border-width: 3px;\r
+}\r
+thead {\r
+ font-family: sans-serif;\r
+ font-weight: bold;\r
+}\r
+tfoot {\r
+ font-weight: bold;\r
+}\r
+\r
+div.hlist {\r
+ margin-top: 0.8em;\r
+ margin-bottom: 0.8em;\r
+}\r
+td.hlist1 {\r
+ vertical-align: top;\r
+ font-style: italic;\r
+ padding-right: 0.8em;\r
+}\r
+td.hlist2 {\r
+ vertical-align: top;\r
+}\r
+\r
+@media print {\r
+ div#footer-badges { display: none; }\r
+}\r
+include::./stylesheets/xhtml11-manpage.css[]\r
+/* Workarounds for IE6's broken and incomplete CSS2. */\r
+\r
+div.sidebar-content {\r
+ background: #ffffee;\r
+ border: 1px solid silver;\r
+ padding: 0.5em;\r
+}\r
+div.sidebar-title, div.image-title {\r
+ font-family: sans-serif;\r
+ font-weight: bold;\r
+ margin-top: 0.0em;\r
+ margin-bottom: 0.5em;\r
+}\r
+\r
+div.listingblock div.content {\r
+ border: 1px solid silver;\r
+ background: #f4f4f4;\r
+ padding: 0.5em;\r
+}\r
+\r
+div.quoteblock-content {\r
+ padding-left: 2.0em;\r
+}\r
+\r
+div.exampleblock-content {\r
+ border-left: 2px solid silver;\r
+ padding-left: 0.5em;\r
+}\r
+</style>\r
+<title>git-reflog(1)</title>\r
+</head>\r
+<body>\r
+<div id="header">\r
+<h1>\r
+git-reflog(1) Manual Page\r
+</h1>\r
+<h2>NAME</h2>\r
+<div class="sectionbody">\r
+<p>git-reflog -\r
+ Manage reflog information\r
+</p>\r
+</div>\r
+</div>\r
+<h2>SYNOPSIS</h2>\r
+<div class="sectionbody">\r
+<div class="verseblock">\r
+<div class="content"><em>git-reflog</em> expire [--dry-run]\r
+ [--expire=<time>] [--expire-unreachable=<time>] [--all] <refs>…</div></div>\r
+</div>\r
+<h2>DESCRIPTION</h2>\r
+<div class="sectionbody">\r
+<p>Reflog is a mechanism to record when the tip of branches are\r
+updated. This command is to manage the information recorded in it.</p>\r
+<p>The subcommand "expire" is used to prune older reflog entries.\r
+Entries older than <tt>expire</tt> time, or entries older than\r
+<tt>expire-unreachable</tt> time and are not reachable from the current\r
+tip, are removed from the reflog. This is typically not used\r
+directly by the end users — instead, see <a href="git-gc.html">git-gc(1)</a>.</p>\r
+</div>\r
+<h2>OPTIONS</h2>\r
+<div class="sectionbody">\r
+<dl>\r
+<dt>\r
+--expire=<time>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Entries older than this time are pruned. Without the\r
+ option it is taken from configuration <tt>gc.reflogExpire</tt>,\r
+ which in turn defaults to 90 days.\r
+</p>\r
+</dd>\r
+<dt>\r
+--expire-unreachable=<time>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Entries older than this time and are not reachable from\r
+ the current tip of the branch are pruned. Without the\r
+ option it is taken from configuration\r
+ <tt>gc.reflogExpireUnreachable</tt>, which in turn defaults to\r
+ 30 days.\r
+</p>\r
+</dd>\r
+<dt>\r
+--all\r
+</dt>\r
+<dd>\r
+<p>\r
+ Instead of listing <refs> explicitly, prune all refs.\r
+</p>\r
+</dd>\r
+</dl>\r
+</div>\r
+<h2>Author</h2>\r
+<div class="sectionbody">\r
+<p>Written by Junio C Hamano <junkio@cox.net></p>\r
+</div>\r
+<h2>Documentation</h2>\r
+<div class="sectionbody">\r
+<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p>\r
+</div>\r
+<h2>GIT</h2>\r
+<div class="sectionbody">\r
+<p>Part of the <a href="git.html">git(7)</a> suite</p>\r
+</div>\r
+<div id="footer">\r
+<div id="footer-text">\r
+Last updated 27-Dec-2006 10:59:43 UTC\r
+</div>\r
+</div>\r
+</body>\r
+</html>\r
--- /dev/null
+git-reflog(1)
+=============
+
+NAME
+----
+git-reflog - Manage reflog information
+
+
+SYNOPSIS
+--------
+[verse]
+'git-reflog' expire [--dry-run]
+ [--expire=<time>] [--expire-unreachable=<time>] [--all] <refs>...
+
+
+DESCRIPTION
+-----------
+
+Reflog is a mechanism to record when the tip of branches are
+updated. This command is to manage the information recorded in it.
+
+The subcommand "expire" is used to prune older reflog entries.
+Entries older than `expire` time, or entries older than
+`expire-unreachable` time and are not reachable from the current
+tip, are removed from the reflog. This is typically not used
+directly by the end users -- instead, see gitlink:git-gc[1].
+
+
+
+OPTIONS
+-------
+
+--expire=<time>::
+ Entries older than this time are pruned. Without the
+ option it is taken from configuration `gc.reflogExpire`,
+ which in turn defaults to 90 days.
+
+--expire-unreachable=<time>::
+ Entries older than this time and are not reachable from
+ the current tip of the branch are pruned. Without the
+ option it is taken from configuration
+ `gc.reflogExpireUnreachable`, which in turn defaults to
+ 30 days.
+
+--all::
+ Instead of listing <refs> explicitly, prune all refs.
+
+Author
+------
+Written by Junio C Hamano <junkio@cox.net>
+
+Documentation
+--------------
+Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
+
+GIT
+---
+Part of the gitlink:git[7] suite
+
</p>\r
</dd>\r
<dt>\r
+gc.reflogexpire\r
+</dt>\r
+<dd>\r
+<p>\r
+ <tt>git reflog expire</tt> removes reflog entries older than\r
+ this time; defaults to 90 days.\r
+</p>\r
+</dd>\r
+<dt>\r
+gc.reflogexpireunreachable\r
+</dt>\r
+<dd>\r
+<p>\r
+ <tt>git reflog expire</tt> removes reflog entries older than\r
+ this time and are not reachable from the current tip;\r
+ defaults to 30 days.\r
+</p>\r
+</dd>\r
+<dt>\r
+gc.rerereresolved\r
+</dt>\r
+<dd>\r
+<p>\r
+ Records of conflicted merge you resolved earlier are\r
+ kept for this many days when <tt>git rerere gc</tt> is run.\r
+ The default is 60 days. See <a href="git-rerere.html">git-rerere(1)</a>.\r
+</p>\r
+</dd>\r
+<dt>\r
+gc.rerereunresolved\r
+</dt>\r
+<dd>\r
+<p>\r
+ Records of conflicted merge you have not resolved are\r
+ kept for this many days when <tt>git rerere gc</tt> is run.\r
+ The default is 15 days. See <a href="git-rerere.html">git-rerere(1)</a>.\r
+</p>\r
+</dd>\r
+<dt>\r
gitcvs.enabled\r
</dt>\r
<dd>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Dec-2006 00:54:31 UTC\r
+Last updated 27-Dec-2006 10:59:43 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git-rerere</em> [clear|diff|status]</p>\r
+<p><em>git-rerere</em> [clear|diff|status|gc]</p>\r
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
<dd>\r
<p>\r
This command is used to prune records of conflicted merge that\r
-occurred long time ago.\r
+occurred long time ago. By default, conflicts older than 15\r
+days that you have not recorded their resolution, and conflicts\r
+older than 60 days, are pruned. These are controlled with\r
+<tt>gc.rerereunresolved</tt> and <tt>gc.rerereresolved</tt> configuration\r
+variables.\r
</p>\r
</dd>\r
</dl>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 13-Dec-2006 21:32:08 UTC\r
+Last updated 27-Dec-2006 10:59:44 UTC\r
</div>\r
</div>\r
</body>\r
SYNOPSIS
--------
-'git-rerere' [clear|diff|status]
+'git-rerere' [clear|diff|status|gc]
DESCRIPTION
-----------
'gc'::
This command is used to prune records of conflicted merge that
-occurred long time ago.
+occurred long time ago. By default, conflicts older than 15
+days that you have not recorded their resolution, and conflicts
+older than 60 days, are pruned. These are controlled with
+`gc.rerereunresolved` and `gc.rerereresolved` configuration
+variables.
DISCUSSION
</p>\r
</dd>\r
<dt>\r
+<a href="git-reflog.html">git-reflog(1)</a>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Manage reflog information.\r
+</p>\r
+</dd>\r
+<dt>\r
<a href="git-relink.html">git-relink(1)</a>\r
</dt>\r
<dd>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 17-Dec-2006 19:31:45 UTC\r
+Last updated 27-Dec-2006 10:59:44 UTC\r
</div>\r
</div>\r
</body>\r
gitlink:git-quiltimport[1]::
Applies a quilt patchset onto the current branch.
+gitlink:git-reflog[1]::
+ Manage reflog information.
+
gitlink:git-relink[1]::
Hardlink common objects in local repositories.
projects / git.git / commitdiff