Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(182)

Unified Diff: docs/src/git-squash-branch.txt

Issue 259863004: Move docs folder to man. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: Created 6 years, 8 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « docs/src/git-reparent-branch.txt ('k') | docs/src/git-squash-branch.demo.1.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: docs/src/git-squash-branch.txt
diff --git a/docs/src/git-squash-branch.txt b/docs/src/git-squash-branch.txt
deleted file mode 100644
index fe7850c59365012be2a3efb8c9ca2659c6b4dc1e..0000000000000000000000000000000000000000
--- a/docs/src/git-squash-branch.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-git-squash-branch(1)
-====================
-
-NAME
-----
-git-squash-branch -
-include::_git-squash-branch_desc.helper.txt[]
-
-SYNOPSIS
---------
-[verse]
-'git squash-branch' [-m <message>]
-
-DESCRIPTION
------------
-
-`git squash-branch` is a simple helper command. It takes all the commits on the
-current branch from the 'merge_base' to HEAD, and reduces them to a single
-commit. The new commit will contain a summary of all the commits which were
-squashed, preceeded by a header message indicating that it's the result of a
-squash (or the message you pass on the command line.).
-
-Squashing branches is useful when trying to rebase-update over branches which
-were pushed to their upsteram (or committed by the 'Commit Queue'), and then
-conflicting changes landed in upstream on top of the push/commit. If you know
-that your branch was committed but linkgit:git-rebase-update[1] isn't able to
-automatically clean it, you can squash the troublesome branch before `git
-rebase-update`, and then when `git rebase-update` presents the conflict, you can
-verify that the conflict diff is what you expected (and then skip it with
-`git rebase --skip`).
-
-OPTIONS
--------
-
--m <message>::
---message=<message>::
- Optional message to use for the first line of the squashed commit. If omitted,
- it defaults to "git squash commit.".
-
-EXAMPLE
--------
-demo:1[]
-
-
-include::_aliases.txt[]
-
-----
-[alias]
- git squash = squash-branch
-----
-
-
-SEE ALSO
---------
-linkgit:git-rebase-update[1]
-
-include::_footer.txt[]
-
-// vim: ft=asciidoc:
« no previous file with comments | « docs/src/git-reparent-branch.txt ('k') | docs/src/git-squash-branch.demo.1.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698