Skip to content

Commit 0904be2

Browse files
committed
git-branchkill git-pull-ff : note that other workspaces should also forget removed branches - IFF they want to
1 parent c23fb4e commit 0904be2

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

git-branchkill

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ P($RES) `pwd` $B master branch"
157157
if [ "$_RES" = 0 ] || \
158158
echo "$_OUT" | egrep " does not appear to be a git repository|remote ref does not exist|Please make sure you have the correct access rights" >/dev/null \
159159
; then
160-
echo "OK, now OTHER clones of this remote repo should 'git fetch --all --prune'"
160+
echo "OK, now OTHER clones of this remote repo should 'git fetch --all --prune' (so they do not re-push branch '$B' - unless this is desired)"
161161
else
162162
RES=$_RES
163163
[ "$_RES" != 0 ] && FAILED="$FAILED

git-pull-ff

+5
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ repodir="$(git rev-parse --show-toplevel)" && \
2929

3030
#git pull $currentbranch
3131
#git pull --tags $currentbranch
32+
33+
### Remove local branches deleted remotely
34+
### TODO : not by default, add an option/envvar to enable this
35+
#git fetch --all --prune
36+
3237
git pull --all
3338
git pull --all --recurse-submodules=yes
3439
git fetch --tags

0 commit comments

Comments
 (0)