diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-11-20 10:32:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-20 10:32:58 -0800 |
| commit | dc998a489a398f51e9fd5e86d23b315a9a7c13b7 (patch) | |
| tree | 642a94f672b2f3652782f51907045ed97e143607 /Documentation/howto/revert-a-faulty-merge.txt | |
| parent | Merge branch 'kb/preload-index-more' (diff) | |
| parent | Documentation: build html for all files in technical and howto (diff) | |
| download | tgif-dc998a489a398f51e9fd5e86d23b315a9a7c13b7.tar.xz | |
Merge branch 'ta/doc-cleanup'
* ta/doc-cleanup:
Documentation: build html for all files in technical and howto
Documentation/howto: convert plain text files to asciidoc
Documentation/technical: convert plain text files to asciidoc
Change headline of technical/send-pack-pipeline.txt to not confuse its content with content from git-send-pack.txt
Shorten two over-long lines in git-bisect-lk2009.txt by abbreviating some sha1
Split over-long synopsis in git-fetch-pack.txt into several lines
Diffstat (limited to 'Documentation/howto/revert-a-faulty-merge.txt')
| -rw-r--r-- | Documentation/howto/revert-a-faulty-merge.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/howto/revert-a-faulty-merge.txt b/Documentation/howto/revert-a-faulty-merge.txt index 6fd711996a..8a685483f4 100644 --- a/Documentation/howto/revert-a-faulty-merge.txt +++ b/Documentation/howto/revert-a-faulty-merge.txt @@ -7,6 +7,10 @@ Abstract: Sometimes a branch that was already merged to the mainline after the offending branch is fixed. Message-ID: <7vocz8a6zk.fsf@gitster.siamese.dyndns.org> References: <alpine.LFD.2.00.0812181949450.14014@localhost.localdomain> +Content-type: text/asciidoc + +How to revert a faulty merge +============================ Alan <alan@clueserver.org> said: |