@@ -161,47 +161,3 @@ chpa = cherry-pick --abort
161
161
chpc = cherry-pick --continue
162
162
chpq = cherry-pick --quit
163
163
chps = cherry-pick --skip
164
-
165
- # Cleanup: Delete local branches that have been merged, except for master, main,
166
- # and develop. This command lists merged branches prompts the user to confirm
167
- # deletion, and then deletes them.
168
- cleanup = " ! f () { git branch --merged | grep -v ' \\*\\|master\\|main\\|develop' | sed -E ' s/^[ \t]+//' ; }; if [ ` f | wc -l | head -n 1` -ne 0 ]; then f; echo Press enter to delete...; read v; f | xargs -n 1 -r git branch -d; fi "
169
-
170
- # Create a new branch, switch to it, and push it to the remote repository.
171
- cbranch = " ! git checkout -b $1 && git push -u origin $1 "
172
-
173
- set-upstream = " ! git branch --set-upstream-to=origin/` git symbolic-ref --short HEAD` "
174
-
175
- contributors = " ! git --no-pager shortlog --summary --numbered --no-merges "
176
- top-contributors = " ! t() { c=${1:- 10} ; git --no-pager shortlog --summary --numbered --no-merges | head -n $c ; }; t "
177
- contributors-merges = " ! git --no-pager shortlog --summary --numbered "
178
- top-contributors-merges = " ! t() { c=${1:- 10} ; git --no-pager shortlog --summary --numbered | head -n $c ; }; t "
179
-
180
- # uumaster = "!f() { ( git fetch upstream && git rebase -i upstream/master ) || echo Error.; }; f"
181
- # author = "!f() { echo -n "Name: "; git config user.name; echo -n "Email: "; git config user.email; }; f"
182
- # upstream = "! set -u; f() { ! local url=$(git remote get-url upstream 2>&1 || true); test \"$url\" != \"$1\" && ( git remote remove upstream || true ) && git remote add upstream \"$1\"; }; f \"$1\" || true"
183
- # whodid = "!git log -i -1 --pretty='format:%an <%ae>'"
184
- # rdate = git find git --no-pager log -1 --format="%ai"
185
- # rci = rcommit
186
- # rcip = rpush
187
- # cdiff = ydiff
188
- # latest = "! git tag | vsort"
189
- # diff = diff --color-words
190
- # cip = "! git commit -a && git push"
191
- # d = ydiff
192
- # ds = ydiff --side-by-side
193
- # cip = rpush
194
- # di = diff
195
- # dic = diff --cached
196
- # diffc = diff --cached
197
- # diffw = diff --word-diff=plain
198
- # diw = diff --word-diff=plain
199
- # ds = diff --stat
200
- # fpull = "! git fetch && git merge --ff-only"
201
- # pusha = push --all
202
- # pulla = pull --all
203
- # ctag = "! set -u; f() { git tag -s \"$1\" -m \"$1\"; }; f"
204
- # rem = rebase origin/master
205
- # up = pull --rebase
206
- # ca = commit -a
207
- # r = reset
0 commit comments