man/html/git-drover.html - Issue 1397313002: Support merging with conflicts with git-drover.

Side by Side Diff: man/html/git-drover.html

Issue 1397313002: Support merging with conflicts with git-drover. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master

Patch Set: Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

OLD	NEW
1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"	1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"

2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">	2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">

3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">	3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">

4 <head>	4 <head>

5 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" / >	5 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" / >

6 <meta name="generator" content="AsciiDoc 8.6.9" />	6 <meta name="generator" content="AsciiDoc 8.6.9" />

7 <title>git-drover(1)</title>	7 <title>git-drover(1)</title>

8 <style type="text/css">	8 <style type="text/css">

9 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */	9 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */

10	10

(...skipping 737 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
748 <p>git-drover -	748 <p>git-drover -

749 Apply a commit from the trunk to a release branch, or from one release branch to another.	749 Apply a commit from the trunk to a release branch, or from one release branch to another.

750 </p>	750 </p>

751 </div>	751 </div>

752 </div>	752 </div>

753 <div id="content">	753 <div id="content">

754 <div class="sect1">	754 <div class="sect1">

755 <h2 id="_synopsis">SYNOPSIS</h2>	755 <h2 id="_synopsis">SYNOPSIS</h2>

756 <div class="sectionbody">	756 <div class="sectionbody">

757 <div class="verseblock">	757 <div class="verseblock">

758 <pre class="content"><em>git drover</em> --branch <branch> --cherry-pick & lt;commit>	758 <pre class="content"><em>git drover</em> --branch <branch>

	759 (--cherry-pick <change> \| --continue [path_to_workdir] \|

	760 --abort [path_to_workdir])

759 [--parent_checkout <path-to-existing-checkout>]	761 [--parent_checkout <path-to-existing-checkout>]

760 [--verbose] [--dry-run]</pre>	762 [--verbose] [--dry-run]</pre>

761 <div class="attribution">	763 <div class="attribution">

762 </div></div>	764 </div></div>

763 </div>	765 </div>

764 </div>	766 </div>

765 <div class="sect1">	767 <div class="sect1">

766 <h2 id="_description">DESCRIPTION</h2>	768 <h2 id="_description">DESCRIPTION</h2>

767 <div class="sectionbody">	769 <div class="sectionbody">

768 <div class="paragraph"><p><code>git drover</code> applies a commit to a release branch. It creates a new workdir from	770 <div class="paragraph"><p><code>git drover</code> applies a commit to a release branch. It creates a new workdir from

769 an existing checkout to avoid downloading a new checkout without affecting the	771 an existing checkout to avoid downloading a new checkout without affecting the

770 existing checkout. Creating a workdir requires symlinks so this does not work on	772 existing checkout.</p></div>

771 Windows. See the EXAMPLE section for the equivalent sequence of commands to run. </p></div>

772 <div class="paragraph"><p><code>git drover</code> does not support reverts. See the EXAMPLE section for the	773 <div class="paragraph"><p><code>git drover</code> does not support reverts. See the EXAMPLE section for the

773 equivalent sequence of commands to run.</p></div>	774 equivalent sequence of commands to run.</p></div>

774 </div>	775 </div>

775 </div>	776 </div>

776 <div class="sect1">	777 <div class="sect1">

777 <h2 id="_options">OPTIONS</h2>	778 <h2 id="_options">OPTIONS</h2>

778 <div class="sectionbody">	779 <div class="sectionbody">

779 <div class="dlist"><dl>	780 <div class="dlist"><dl>

780 <dt class="hdlist1">	781 <dt class="hdlist1">

781 --branch <branch>	782 --branch <branch>

782 </dt>	783 </dt>

783 <dd>	784 <dd>

784 <p>	785 <p>

785 The branch to cherry-pick the commit to.	786 The branch to cherry-pick the commit to.

786 </p>	787 </p>

787 </dd>	788 </dd>

788 <dt class="hdlist1">	789 <dt class="hdlist1">

789 --cherry-pick <commit>	790 --cherry-pick <commit>

790 </dt>	791 </dt>

791 <dd>	792 <dd>

792 <p>	793 <p>

793 The commit to cherry-pick.	794 The commit to cherry-pick.

794 </p>	795 </p>

795 </dd>	796 </dd>

796 <dt class="hdlist1">	797 <dt class="hdlist1">

	798 --continue [path_to_workdir]

	799 </dt>

	800 <dd>

	801 <p>

	802 Continue a cherry-pick that required manual resolution. The path to the drover

	803 workdir is optional. If unspecified, the current directory is used.

	804 </p>

	805 </dd>

	806 <dt class="hdlist1">

	807 --abort [path_to_workdir]

	808 </dt>

	809 <dd>

	810 <p>

	811 Abort a cherry-pick that required manual resolution and clean up its workdir.

	812 The path to the drover workdir is optional. If unspecified, the current

	813 directory is used.

	814 </p>

	815 </dd>

	816 <dt class="hdlist1">

797 --parent_checkout	817 --parent_checkout

798 </dt>	818 </dt>

799 <dd>	819 <dd>

800 <p>	820 <p>

801 The path to the chromium checkout to use as the source for a creating	821 The path to the chromium checkout to use as the source for a creating

802 git-new-workdir workdir to use for cherry-picking. If unspecified, the current	822 git-new-workdir workdir to use for cherry-picking. If unspecified, the current

803 directory is used.	823 directory is used.

804 </p>	824 </p>

805 </dd>	825 </dd>

806 <dt class="hdlist1">	826 <dt class="hdlist1">

(...skipping 24 matching lines...) Expand all Loading...
831 <div class="sectionbody">	851 <div class="sectionbody">

832 <div class="sect2">	852 <div class="sect2">

833 <h3 id="_prerequisites">PREREQUISITES</h3>	853 <h3 id="_prerequisites">PREREQUISITES</h3>

834 <div class="paragraph"><p>Before working with branches, you must	854 <div class="paragraph"><p>Before working with branches, you must

835 <code>gclient sync --with_branch_heads</code>	855 <code>gclient sync --with_branch_heads</code>

836 at least once to fetch the branches.</p></div>	856 at least once to fetch the branches.</p></div>

837 <div class="sect3">	857 <div class="sect3">

838 <h4 id="_merge_example">Merge Example</h4>	858 <h4 id="_merge_example">Merge Example</h4>

839 <div class="paragraph"><p></p></div><div class="listingblock"><div class="conten t"><pre><code># Here's a commit (from some.committer) that we want to 'drover'.	859 <div class="paragraph"><p></p></div><div class="listingblock"><div class="conten t"><pre><code># Here's a commit (from some.committer) that we want to 'drover'.

840 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</ span>	860 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</ span>

841 <span style="color: #e7e71c">commit 8b79b7b2f7e6e728f9a3c7b385c72efc7c47244a</sp an>	861 <span style="color: #e7e71c">commit f7448045de01b54914db8b902ca77fbbf42b3146</sp an>

842 Author: some.committer <some.committer@chromium.org>	862 Author: some.committer <some.committer@chromium.org>

843 AuthorDate: Thu Apr 10 08:54:46 2014 +0000	863 AuthorDate: Thu Apr 10 08:54:46 2014 +0000

844 Commit: some.committer <some.committer@chromium.org>	864 Commit: some.committer <some.committer@chromium.org>

	865 CommitDate: Thu Apr 10 08:54:46 2014 +0000

	866

	867 This change needs to go to branch 9999

	868

	869 # Now do the 'drover'.

	870 <span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --che rry-pick f7448045de01b54914db8b902ca77fbbf42b3146</span>

	871 Going to cherry-pick

	872 """

	873 <span style="color: #e7e71c">commit f7448045de01b54914db8b902ca77fbbf42b3146</sp an>

	874 Author: some.committer <some.committer@chromium.org>

	875 Date: Thu Apr 10 08:54:46 2014 +0000

	876

	877 This change needs to go to branch 9999

	878 """

	879 to 9999. Continue (y/n)? y

	880

	881 # A cl is uploaded to rietveld, where it can be reviewed before landing.

	882

	883 About to land on 9999. Continue (y/n)? y

	884 # The cherry-pick cl is landed on the branch 9999.

	885 </code></pre></div></div><p><div class="paragraph"></p></div>

	886 </div>

	887 <div class="sect3">

	888 <h4 id="_merge_with_conflicts_example">Merge with Conflicts Example</h4>

	889 <div class="paragraph"><p></p></div><div class="listingblock"><div class="conten t"><pre><code># Here's a commit (from some.committer) that we want to 'drover'.

	890 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</ span>

	891 <span style="color: #e7e71c">commit ca8e437616d853cb10008a252b54cfed928f157c</sp an>

	892 Author: some.committer <some.committer@chromium.org>

	893 AuthorDate: Thu Apr 10 08:54:46 2014 +0000

	894 Commit: some.committer <some.committer@chromium.org>

845 CommitDate: Thu Apr 10 08:54:46 2014 +0000	895 CommitDate: Thu Apr 10 08:54:46 2014 +0000

846	896

847 This change needs to go to branch 9999	897 This change needs to go to branch 9999

848	898

849 # Now do the 'drover'.	899 # Now do the 'drover'.

850 <span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --che rry-pick 8b79b7b2f7e6e728f9a3c7b385c72efc7c47244a</span>	900 <span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --che rry-pick ca8e437616d853cb10008a252b54cfed928f157c</span>

851 Going to cherry-pick	901 Going to cherry-pick

852 """	902 """

853 <span style="color: #e7e71c">commit 8b79b7b2f7e6e728f9a3c7b385c72efc7c47244a</sp an>	903 <span style="color: #e7e71c">commit ca8e437616d853cb10008a252b54cfed928f157c</sp an>

854 Author: some.committer <some.committer@chromium.org>	904 Author: some.committer <some.committer@chromium.org>

855 Date: Thu Apr 10 08:54:46 2014 +0000	905 Date: Thu Apr 10 08:54:46 2014 +0000

856	906

857 This change needs to go to branch 9999	907 This change needs to go to branch 9999

858 """	908 """

859 to 9999. Continue (y/n)? y	909 to 9999. Continue (y/n)? y

860	910

	911 Error: Patch failed to apply.

	912

	913 A workdir for this cherry-pick has been created in

	914 /tmp/drover_9999

	915

	916 To continue, resolve the conflicts there and run

	917 git drover --continue /tmp/drover_9999

	918

	919 To abort this cherry-pick run

	920 git drover --abort /tmp/drover_9999

	921

	922 <span style="font-weight: bold; color: #ffffff">$ pushd /tmp/drover_9999</span>

	923 # Manually resolve conflicts.

	924 <span style="font-weight: bold; color: #ffffff">$ git add path/to/file_with_conf licts</span>

	925 <span style="font-weight: bold; color: #ffffff">$ popd</span>

	926 <span style="font-weight: bold; color: #ffffff">$ git drover --continue /tmp/dro ver_9999</span>

	927

861 # A cl is uploaded to rietveld, where it can be reviewed before landing.	928 # A cl is uploaded to rietveld, where it can be reviewed before landing.

862	929

863 About to land on 9999. Continue (y/n)? y	930 About to land on 9999. Continue (y/n)? y

864 # The cherry-pick cl is landed on the branch 9999.	931 # The cherry-pick cl is landed on the branch 9999.

865 </code></pre></div></div><p><div class="paragraph"></p></div>	932 </code></pre></div></div><p><div class="paragraph"></p></div>

866 </div>	933 </div>

867 <div class="sect3">	934 <div class="sect3">

868 <h4 id="_revert_example">Revert Example</h4>	935 <h4 id="_revert_example">Revert Example</h4>

869 <div class="paragraph"><p></p></div><div class="listingblock"><div class="conten t"><pre><code># Make sure we have the most up-to-date branch sources.	936 <div class="paragraph"><p></p></div><div class="listingblock"><div class="conten t"><pre><code># Make sure we have the most up-to-date branch sources.

870 <span style="font-weight: bold; color: #ffffff">$ git fetch</span>	937 <span style="font-weight: bold; color: #ffffff">$ git fetch</span>

871	938

872 # Checkout the branch with the change we want to revert.	939 # Checkout the branch with the change we want to revert.

873 <span style="font-weight: bold; color: #ffffff">$ git checkout -b drover_9999 br anch-heads/9999</span>	940 <span style="font-weight: bold; color: #ffffff">$ git checkout -b drover_9999 br anch-heads/9999</span>

874 Branch drover_9999 set up to track remote ref refs/branch-heads/9999.	941 Branch drover_9999 set up to track remote ref refs/branch-heads/9999.

875	942

876 # Here's the commit we want to revert.	943 # Here's the commit we want to revert.

877 <span style="font-weight: bold; color: #ffffff">$ git log -n 1</span>	944 <span style="font-weight: bold; color: #ffffff">$ git log -n 1</span>

878 <span style="color: #e7e71c">commit 33b0e9164d4564eb8a4b4e5b951bba6edeeecacb</sp an>	945 <span style="color: #e7e71c">commit 98d544a18e19bb80be9d4a8094efda8ab1d2534b</sp an>

879 Author: some.committer <some.committer@chromium.org>	946 Author: some.committer <some.committer@chromium.org>

880 Date: Thu Apr 10 08:54:46 2014 +0000	947 Date: Thu Apr 10 08:54:46 2014 +0000

881	948

882 This change is horribly broken.	949 This change is horribly broken.

883	950

884 # Now do the revert.	951 # Now do the revert.

885 <span style="font-weight: bold; color: #ffffff">$ git revert 33b0e9164d4564eb8a4 b4e5b951bba6edeeecacb</span>	952 <span style="font-weight: bold; color: #ffffff">$ git revert 98d544a18e19bb80be9 d4a8094efda8ab1d2534b</span>

886	953

887 # That reverted the change and committed the revert.	954 # That reverted the change and committed the revert.

888 <span style="font-weight: bold; color: #ffffff">$ git log -n 1</span>	955 <span style="font-weight: bold; color: #ffffff">$ git log -n 1</span>

889 <span style="color: #e7e71c">commit 8a2d2bb98b9cfc9260a9bc86da1eec2a43f43f8b</sp an>	956 <span style="color: #e7e71c">commit 0fc5e9101886dcb1aebbb9434d0df9341f0dedfe</sp an>

890 Author: you <you@chromium.org>	957 Author: you <you@chromium.org>

891 Date: Thu Apr 10 09:11:36 2014 +0000	958 Date: Thu Apr 10 09:11:36 2014 +0000

892	959

893 Revert "This change is horribly broken."	960 Revert "This change is horribly broken."

894	961

895 This reverts commit 33b0e9164d4564eb8a4b4e5b951bba6edeeecacb.	962 This reverts commit 98d544a18e19bb80be9d4a8094efda8ab1d2534b.

896	963

897 # As with old drover, reverts are generally OK to commit without LGTM.	964 # As with old drover, reverts are generally OK to commit without LGTM.

898 <span style="font-weight: bold; color: #ffffff">$ git cl upload -r some.committe r@chromium.org --send-mail</span>	965 <span style="font-weight: bold; color: #ffffff">$ git cl upload -r some.committe r@chromium.org --send-mail</span>

899 <span style="font-weight: bold; color: #ffffff">$ git cl land --bypass-hooks</sp an>	966 <span style="font-weight: bold; color: #ffffff">$ git cl land --bypass-hooks</sp an>

900 </code></pre></div></div><p><div class="paragraph"></p></div>	967 </code></pre></div></div><p><div class="paragraph"></p></div>

901 </div>	968 </div>

902 <div class="sect3">	969 <div class="sect3">

903 <h4 id="_manual_merge_example">Manual Merge Example</h4>	970 <h4 id="_manual_merge_example">Manual Merge Example</h4>

904 <div class="paragraph"><p></p></div><div class="listingblock"><div class="conten t"><pre><code># Make sure we have the most up-to-date branch sources.	971 <div class="paragraph"><p></p></div><div class="listingblock"><div class="conten t"><pre><code># Make sure we have the most up-to-date branch sources.

905 <span style="font-weight: bold; color: #ffffff">$ git fetch</span>	972 <span style="font-weight: bold; color: #ffffff">$ git fetch</span>

906	973

907 # Here's a commit (from some.committer) that we want to 'drover'.	974 # Here's a commit (from some.committer) that we want to 'drover'.

908 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</ span>	975 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</ span>

909 <span style="color: #e7e71c">commit 537f446fa3d5e41acab017bb0b082fbd0c9eb043</sp an>	976 <span style="color: #e7e71c">commit b27fff7b167964750303f60222e79f3932f438e0</sp an>

910 Author: some.committer <some.committer@chromium.org>	977 Author: some.committer <some.committer@chromium.org>

911 AuthorDate: Thu Apr 10 08:54:46 2014 +0000	978 AuthorDate: Thu Apr 10 08:54:46 2014 +0000

912 Commit: some.committer <some.committer@chromium.org>	979 Commit: some.committer <some.committer@chromium.org>

913 CommitDate: Thu Apr 10 08:54:46 2014 +0000	980 CommitDate: Thu Apr 10 08:54:46 2014 +0000

914	981

915 This change needs to go to branch 9999	982 This change needs to go to branch 9999

916	983

917 # Checkout the branch we want to 'drover' to.	984 # Checkout the branch we want to 'drover' to.

918 <span style="font-weight: bold; color: #ffffff">$ git checkout -b drover_9999 br anch-heads/9999</span>	985 <span style="font-weight: bold; color: #ffffff">$ git checkout -b drover_9999 br anch-heads/9999</span>

919 Branch drover_9999 set up to track remote ref refs/branch-heads/9999.	986 Branch drover_9999 set up to track remote ref refs/branch-heads/9999.

920	987

921 # Now do the 'drover'.	988 # Now do the 'drover'.

922 # IMPORTANT!!! Do Not leave off the '-x' flag	989 # IMPORTANT!!! Do Not leave off the '-x' flag

923 <span style="font-weight: bold; color: #ffffff">$ git cherry-pick -x 537f446fa3d 5e41acab017bb0b082fbd0c9eb043</span>	990 <span style="font-weight: bold; color: #ffffff">$ git cherry-pick -x b27fff7b167 964750303f60222e79f3932f438e0</span>

924 [drover_9999 b468abc] This change needs to go to branch 9999	991 [drover_9999 bd8dc1c] This change needs to go to branch 9999

925 Author: some.committer <some.committer@chromium.org>	992 Author: some.committer <some.committer@chromium.org>

926 Date: Thu Apr 10 08:54:46 2014 +0000	993 Date: Thu Apr 10 08:54:46 2014 +0000

927 1 file changed, 1 insertion(+)	994 1 file changed, 1 insertion(+)

928 create mode 100644 modified_file	995 create mode 100644 modified_file

929	996

930 # That took the code authored by some.committer and committed it to	997 # That took the code authored by some.committer and committed it to

931 # the branch by the person who drovered it (i.e. you).	998 # the branch by the person who drovered it (i.e. you).

932 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</ span>	999 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</ span>

933 <span style="color: #e7e71c">commit b468abc42ddd4fd9aecc48c3eda172265306d2b4</sp an>	1000 <span style="color: #e7e71c">commit bd8dc1c0678913e36b2b06855810803a2e0ab906</sp an>

934 Author: some.committer <some.committer@chromium.org>	1001 Author: some.committer <some.committer@chromium.org>

935 AuthorDate: Thu Apr 10 08:54:46 2014 +0000	1002 AuthorDate: Thu Apr 10 08:54:46 2014 +0000

936 Commit: you <you@chromium.org>	1003 Commit: you <you@chromium.org>

937 CommitDate: Thu Apr 10 09:11:36 2014 +0000	1004 CommitDate: Thu Apr 10 09:11:36 2014 +0000

938	1005

939 This change needs to go to branch 9999	1006 This change needs to go to branch 9999

940	1007

941 (cherry picked from commit 537f446fa3d5e41acab017bb0b082fbd0c9eb043)	1008 (cherry picked from commit b27fff7b167964750303f60222e79f3932f438e0)

942	1009

943 # Looks good. Ship it!	1010 # Looks good. Ship it!

944 <span style="font-weight: bold; color: #ffffff">$ git cl upload</span>	1011 <span style="font-weight: bold; color: #ffffff">$ git cl upload</span>

945 # Wait for LGTM or TBR it.	1012 # Wait for LGTM or TBR it.

946 <span style="font-weight: bold; color: #ffffff">$ git cl land</span>	1013 <span style="font-weight: bold; color: #ffffff">$ git cl land</span>

947 # Or skip the LGTM/TBR and just 'git cl land --bypass-hooks'	1014 # Or skip the LGTM/TBR and just 'git cl land --bypass-hooks'

948 </code></pre></div></div><p><div class="paragraph"></p></div>	1015 </code></pre></div></div><p><div class="paragraph"></p></div>

949 </div>	1016 </div>

950 </div>	1017 </div>

951 </div>	1018 </div>

952 </div>	1019 </div>

953 <div class="sect1">	1020 <div class="sect1">

954 <h2 id="_see_also">SEE ALSO</h2>	1021 <h2 id="_see_also">SEE ALSO</h2>

955 <div class="sectionbody">	1022 <div class="sectionbody">

956 <div class="paragraph"><p><a href="git-cherry-pick.html">git-cherry-pick(1)</a>, <a href="git-revert.html">git-revert(1)</a></p></div>	1023 <div class="paragraph"><p><a href="git-cherry-pick.html">git-cherry-pick(1)</a>, <a href="git-revert.html">git-revert(1)</a></p></div>

957 </div>	1024 </div>

958 </div>	1025 </div>

959 <div class="sect1">	1026 <div class="sect1">

960 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>	1027 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>

961 <div class="sectionbody">	1028 <div class="sectionbody">

962 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to	1029 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to

963 assist with the development of chromium and related projects. Download the tools	1030 assist with the development of chromium and related projects. Download the tools

964 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div>	1031 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div>

965 </div>	1032 </div>

966 </div>	1033 </div>

967 </div>	1034 </div>

968 <div id="footnotes"><hr /></div>	1035 <div id="footnotes"><hr /></div>

969 <div id="footer">	1036 <div id="footer">

970 <div id="footer-text">	1037 <div id="footer-text">

971 Last updated 2015-09-23 11:11:58 AEST	1038 Last updated 2015-10-20 18:00:26 AEDT

972 </div>	1039 </div>

973 </div>	1040 </div>

974 </body>	1041 </body>

975 </html>	1042 </html>

OLD	NEW

« no previous file with comments | « git_drover.py ('k') | man/man1/git-drover.1 » ('j') | no next file with comments »