summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2008-07-16 12:25:00 +0200
committerJim Meyering <meyering@redhat.com>2008-07-16 15:29:04 +0200
commit186b45aaede1b6356d7b865fd3a01ee351ba3ead (patch)
tree8d54b88a9c1abf01a25839a570ec5a124fdbf22b
parent773be9eca85da9a9a33d42d29ecfd04c9aec5c3f (diff)
downloadcoreutils-186b45aaede1b6356d7b865fd3a01ee351ba3ead.tar.xz
* HACKING: describe how to find a misplaced change-set
-rw-r--r--HACKING16
1 files changed, 16 insertions, 0 deletions
diff --git a/HACKING b/HACKING
index 457048e60..b83565224 100644
--- a/HACKING
+++ b/HACKING
@@ -360,6 +360,22 @@ Miscellaneous useful git commands
you an interface with which you can reorder and modify arbitrary
change sets on that branch.
+ * if you "misplace" a change set, i.e., via git reset --hard ..., so that
+ it's no longer reachable by any branch, you can use "git fsck" to find
+ its SHA1 and then tag it or cherry-pick it onto an existing branch.
+ For example, run this:
+ git fsck --lost-found HEAD && cd .git/lost-found/commit \
+ && for i in *; do git show $i|grep SOME_IDENTIFYING_STRING \
+ && echo $i; done
+ The "git fsck ..." command creates the .git/lost-found/... hierarchy
+ listing all unreachable objects. Then the for loop
+ print SHA1s for commits that match via log or patch.
+ For example, say that found 556fbb57216b119155cdda824c98dc579b8121c8,
+ you could run "git show 556fbb57216b119" to examine the change set,
+ or "git checkout -b found 556fbb5721" to give it a branch name.
+ Finally, you might run "git checkout master && git cherry-pick 556fbb5721"
+ to put that change on the tip of "master".
+
-------------------------------------------
Finding things to do