dkubb · August 29, 2015 14:13 · Feb 13, 2015 · Feb 13, 2015 · Feb 13, 2015 · Feb 10, 2015
diff --git a/gistfile1.txt → gistfile1.md b/gistfile1.txt → gistfile1.md
diff --git a/gistfile1.txt b/gistfile1.txt
@@ -0,0 +1 @@
+Moved to https://github.com/dkubb/git-tools
diff --git a/git-fix-branch b/git-fix-branch
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-
-# Fix branch commit data to be the same as author data
-
-set -euo pipefail
-IFS=$'\n\t'
-
-parent=${1-master}
-
-# The command to execute for each commit
-read -r -d '' command <<-'COMMAND' || true
-export GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"
-export GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"
-export GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
-COMMAND
-
-# Rebase the current branch on top of the parent
-git rebase --keep-empty -- $parent
-
-# Rewrite all commits against the current commit
-git filter-branch --force --env-filter "$command" -- "$parent..HEAD"

diff --git a/git-prune-all b/git-prune-all
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-# Prune all merged local and remote branches
-
-set -euo pipefail
-IFS=$'\n\t'
-
-branch=$(git rev-parse --abbrev-ref HEAD)
-remote=$(git config "branch.${branch}.remote")
-
-git remote update > /dev/null
-git remote prune "$remote"
-
-git branch --remotes --merged "$remote/$branch" \
-  | awk -F\"/\" "!/(>|$branch)/ {print \$2}" \
-  | xargs --no-run-if-empty --max-lines 1 git push "$remote" --delete

diff --git a/git-push-each b/git-push-each
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-# Push commits individually to trigger CI builds for each
-
-set -euo pipefail
-IFS=$'\n\t'
-
-parent=${1-master}
-branch=$(git rev-parse --abbrev-ref HEAD)
-remote=$(git config "branch.${branch}.remote")
-
-# Commits in the local branch not in the remote branch
-commits=$(
-  comm -13 \
-    <(git rev-list "$remote/$parent..$remote/$branch" --reverse) \
-    <(git rev-list "$parent..$branch" --reverse)
-)
-
-# Push all commits not in the parent branch
-for commit in $commits
-do
-  # Trigger CI for each commit by pushing them individually
-  git push --force "$remote" "$commit:$branch"
-done

diff --git a/git-fix-branch b/git-fix-branch
@@ -15,7 +15,7 @@ export GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
 COMMAND
 
 # Rebase the current branch on top of the parent
-git rebase $parent
+git rebase --keep-empty -- $parent
 
 # Rewrite all commits against the current commit
 git filter-branch --force --env-filter "$command" -- "$parent..HEAD"
diff --git a/git-reb → git-fix-branch b/git-reb → git-fix-branch
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Rebase a branch on a parent branch, preserving commit metadata
+# Fix branch commit data to be the same as author data
 
 set -euo pipefail
 IFS=$'\n\t'

diff --git a/git-prune-all b/git-prune-all
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+# Prune all merged local and remote branches
+
+set -euo pipefail
+IFS=$'\n\t'
+
+branch=$(git rev-parse --abbrev-ref HEAD)
+remote=$(git config "branch.${branch}.remote")
+
+git remote update > /dev/null
+git remote prune "$remote"
+
+git branch --remotes --merged "$remote/$branch" \
+  | awk -F\"/\" "!/(>|$branch)/ {print \$2}" \
+  | xargs --no-run-if-empty --max-lines 1 git push "$remote" --delete
diff --git a/git-push-each b/git-push-each
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+# Push commits individually to trigger CI builds for each
+
+set -euo pipefail
+IFS=$'\n\t'
+
+parent=${1-master}
+branch=$(git rev-parse --abbrev-ref HEAD)
+remote=$(git config "branch.${branch}.remote")
+
+# Commits in the local branch not in the remote branch
+commits=$(
+  comm -13 \
+    <(git rev-list "$remote/$parent..$remote/$branch" --reverse) \
+    <(git rev-list "$parent..$branch" --reverse)
+)
+
+# Push all commits not in the parent branch
+for commit in $commits
+do
+  # Trigger CI for each commit by pushing them individually
+  git push --force "$remote" "$commit:$branch"
+done
diff --git a/git-reb b/git-reb
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+# Rebase a branch on a parent branch, preserving commit metadata
+
+set -euo pipefail
+IFS=$'\n\t'
+
+parent=${1-master}
+
+# The command to execute for each commit
+read -r -d '' command <<-'COMMAND' || true
+export GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"
+export GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"
+export GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
+COMMAND
+
+# Rebase the current branch on top of the parent
+git rebase $parent
+
+# Rewrite all commits against the current commit
+git filter-branch --force --env-filter "$command" -- "$parent..HEAD"
No results found