From 5dfae5d9e380ac4c396df1064d43a71d0a4ad471 Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Tue, 5 Apr 2011 16:20:03 -0500 Subject: [PATCH] COOKBOOK: Adding recipie for checking only for the uniq commits on master. This could probably be rolled into a script, but for now. --- COOKBOOK | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/COOKBOOK b/COOKBOOK index f0d0aef..e10044e 100644 --- a/COOKBOOK +++ b/COOKBOOK @@ -28,3 +28,9 @@ Adding acks onto a branch (from the git filter-branch man page): 3. git filter-branch -f --msg-filter 'cat && echo "Acked-by: (copy name/email from acked by line here)"' master..acked 4. (check the acked branch to make sure it looks good) 5. git checkout for-trunk; git reset --hard acked; git branch -d acked (Don't need to keep the acked branch around anymore) + + +Looking at the commits that are only on the master branch and not in the 2.4 release: + +git log --oneline v2.4.0..master | sed -e 's/\w* //' > file.txt && git log --oneline v2.4.0..2.4 | sed -e 's/\w* //' >> file.txt && cat file.txt | sort | uniq -u | tee uniq.txt +