diff options
| author | Mattias Andrée <maandree@operamail.com> | 2014-03-23 06:05:06 +0100 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2014-03-23 06:05:06 +0100 |
| commit | ee45604f12254dc57881467396998a15a4cc156c (patch) | |
| tree | b9dc888319c6c3321fca6e2ed8beb81edc1afa86 | |
| parent | warn against squashing non-feature branches, for example the master branch (diff) | |
| download | using-git-ee45604f12254dc57881467396998a15a4cc156c.tar.gz using-git-ee45604f12254dc57881467396998a15a4cc156c.tar.bz2 using-git-ee45604f12254dc57881467396998a15a4cc156c.tar.xz | |
update todo
Signed-off-by: Mattias Andrée <maandree@operamail.com>
| -rw-r--r-- | using-git.texinfo | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/using-git.texinfo b/using-git.texinfo index c84529b..5e584e1 100644 --- a/using-git.texinfo +++ b/using-git.texinfo @@ -1366,6 +1366,7 @@ command. * Squash'em:: Merging commits into one * Think about the children:: Repairing the history of child branches @end menu +@c TODO cherry-pick reset |