Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simplified git add -p alias #43

Merged
merged 1 commit into from
Aug 12, 2012
Merged

Simplified git add -p alias #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion git.scmbrc.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ git_alias="g"
# 1. 'SCM Breeze' functions
git_status_shortcuts_alias="gs"
git_add_shortcuts_alias="ga"
git_add_patch_shortcuts_alias="gap"
git_add_patch_alias="gap"
git_show_files_alias="gsf"
exec_git_expand_args_alias="ge"
# 2. Commands that handle paths (with shortcut args expanded)
Expand Down
2 changes: 1 addition & 1 deletion lib/git/aliases_and_bindings.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ __git_alias () {
# SCM Breeze functions
_alias $git_status_shortcuts_alias="git_status_shortcuts"
_alias $git_add_shortcuts_alias="git_add_shortcuts"
_alias $git_add_patch_shortcuts_alias="git_add_patch_shortcuts"
_alias $exec_git_expand_args_alias="exec_git_expand_args"
_alias $git_show_files_alias="git_show_affected_files"
_alias $git_commit_all_alias='git_commit_all'
Expand All @@ -67,6 +66,7 @@ __git_alias "$git_rm_alias" "$_exp git" "rm"
__git_alias "$git_blame_alias" "$_exp git" "blame"
__git_alias "$git_diff_alias" "$_exp git" "diff"
__git_alias "$git_diff_cached_alias" "$_exp git" "diff" "--cached"
__git_alias "$git_add_patch_alias" "$_exp git" "add" "-p"

# Standard commands
__git_alias "$git_clone_alias" "git" 'clone'
Expand Down
30 changes: 0 additions & 30 deletions lib/git/status_shortcuts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,36 +92,6 @@ git_silent_add_shortcuts() {
fi
}

# 'git add -p' wrapper
# This shortcut means 'stage my selection of patchs for the file'
# Should be used in conjunction with the git_status_shortcuts() function for 'git status'.
# -------------------------------------------------------------------------------
git_add_patch_shortcuts() {
if [ -z "$1" ]; then
echo "Usage: gap <file> => git add -p <file>"
echo " gap 1 => git add -p \$e1"
echo " gap 2-4 => git add -p \$e2 \$e3 \$e4"
echo " gap 2 5-7 => git add -p \$e2 \$e5 \$e6 \$e7"
else
git_silent_add_patch_shortcuts "$@"
# Makes sense to run 'git status' after this command.
git_status_shortcuts
fi
}
# Does nothing if no args are given.
git_silent_add_patch_shortcuts() {
if [ -n "$1" ]; then
# Expand args and process resulting set of files.
IFS=$'\t'
for file in $(git_expand_args "$@"); do
git add -p "$file"
echo -e "# Added '$file'"
done
IFS=$' \t\n'
echo "#"
fi
}

# Prints a list of all files affected by a given SHA1,
# and exports numbered environment variables for each file.
git_show_affected_files(){
Expand Down