Skip to content

Commit fce20d5

Browse files
Costa ShulyupinCosta Shulyupin
Costa Shulyupin
authored and
Costa Shulyupin
committed
->selectively, small fixes
1 parent bd8a6e5 commit fce20d5

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

git-wizard

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -256,9 +256,9 @@ modified()
256256
prs modified '%1 file(s)' 'ls-files --modified | wc -l'
257257
actg modified 't' "stat" 'diff --stat'
258258
actg modified ' ' "show" 'diff'
259-
actg modified u "update stage with modifications interactively" 'add --patch'
260-
actg modified s "push into stash interactively" 'stash push --patch'
261-
actg modified d "discard interactively" 'checkout --patch'
259+
actg modified u "update stage with modifications selectively" 'add --patch'
260+
actg modified s "push into stash selectively" 'stash push --patch'
261+
actg modified d "discard selectively" 'checkout --patch'
262262
acti modified 'e' "edit with vim quickfix" "vim -q <(git diff -U0 --relative --no-prefix | diff_to_quickfix)"
263263
actg modified 'h' "html view" "diff --relative --no-prefix | pygmentize -l diff -f html -O full > modifications.html; xdg-open modifications.html"
264264
actg modified 'g' "gui" "gui"
@@ -267,7 +267,7 @@ modified()
267267
actg staged ' ' "show" 'diff --staged'
268268
acti staged e "edit with vim quickfix" "vim -q <(git diff -U0 --staged --relative --no-prefix | diff_to_quickfix)"
269269
actg staged c "commit" commit
270-
actg staged R "unstage (reset) modifications interactively" 'reset --patch'
270+
actg staged r "unstage (reset) modifications selectively" 'reset --patch'
271271
}
272272

273273
head-branch()
@@ -276,15 +276,15 @@ head-branch()
276276
acti head ' ' 'print report' report
277277
actg head c 'show the last commit' 'show --stat'
278278
acti head e "edit with vim quickfix" "vim -q <(git show -U0 --relative --no-prefix | diff_to_quickfix)"
279-
actg head l 'list recent log' 'log --pretty="format:%ar: %ae: %h %s" --reverse -n $((LINES-2))'
280-
actg head s "check head status" 'status --untracked-files=no HEAD' # without modifered
279+
actg head l 'list recent log' $'log --pretty="format:%ar: %ae: %h %s \e[4m%D\e[0m" --reverse -n $((LINES-2))'
280+
actg head s "check the head status" 'status --untracked-files=no HEAD' # without modifered
281281
acti head k "explore with gitk" "gitk"
282282
acti head t "text-mode interface for Git" tig
283283
actg head a "amend the last commit" "commit --amend"
284284

285285
rep branch '%1' 'rev-parse --abbrev-ref HEAD'
286286
rep local_branches '%1' 'branch | wc -l'
287-
branches_format=$'%(committerdate:short) - %(align:left,25)%(committerdate:relative) %(upstream:trackshort) %(end) %(align:left,25)%(objectname:short) \e[1m%(refname:short)\e[0m%(end) %(subject)'
287+
branches_format=$'%(committerdate:short) - %(align:left,25)%(committerdate:relative) %(upstream:trackshort) %(end) %(align:left,25)%(objectname:short) \e[1m%(refname:short)\e[0m%(end) %(subject) \e[3;37m%(authorname)\e[0m'
288288
actg local_branches ' ' 'list' "for-each-ref --sort=committerdate --format '$branches_format' refs/heads"
289289
rep remote_branches '%1' 'branch --remote | wc -l'
290290
actg remote_branches ' ' 'list recent' "branch --remotes --sort=committerdate --format '$branches_format' | tail -n $((LINES-2))"
@@ -316,7 +316,7 @@ remote()
316316

317317
action_itemes()
318318
{
319-
rep action_itemes '%1' 'grep --max-depth=3 -w -eTODO -eFIXME | wc -l'
319+
rep action_itemes '%1' 'grep --max-depth=2 -w -eTODO -eFIXME | wc -l'
320320
actg action_itemes ' ' list 'grep -w -n -eTODO -eFIXME'
321321
acti action_itemes 'e' edit 'vim -q <(git grep -w -n -eTODO -eFIXME)'
322322

@@ -331,7 +331,7 @@ untracked()
331331
actg untracked ' ' "list" 'status --untracked-files=normal'
332332
actg untracked a "add and stage" 'add --interactive'
333333
actg untracked c "cleanup" 'clean --interactive -d'
334-
acti untracked r "remove interactively" 'rm --recursive --interactive=always $(git ls-files --others --directory --exclude-standard --exclude .gitignore)'
334+
acti untracked r "remove selectively" 'rm --recursive --interactive=always $(git ls-files --others --directory --exclude-standard --exclude .gitignore)'
335335
actg untracked i "ignore" \
336336
'ls-files --others --directory --exclude-standard --exclude .gitignore \
337337
>> .gitignore'

0 commit comments

Comments
 (0)