From 417635b07236977dcd78a407bf0b256e152af911 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Sun, 11 May 2014 01:09:46 -0500 Subject: [PATCH] Add more default aliases Signed-off-by: Felipe Contreras --- Documentation/git-branch.txt | 4 ++++ Documentation/git-cherry-pick.txt | 4 ++++ Documentation/git-mergetool.txt | 4 ++++ config.c | 3 +++ t/t1300-repo-config.sh | 25 +++++++++++++++++++++++-- t/t1305-config-include.sh | 3 +++ t/t9902-completion.sh | 3 +++ 7 files changed, 44 insertions(+), 2 deletions(-) diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 4a7037f1c8..13c4e08222 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -20,6 +20,10 @@ SYNOPSIS 'git branch' (-d | -D) [-r] ... 'git branch' --edit-description [] +ALIAS +~~~~~ +'git br' + DESCRIPTION ----------- diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 6154e57238..0d9c4c1167 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -14,6 +14,10 @@ SYNOPSIS 'git cherry-pick' --quit 'git cherry-pick' --abort +ALIAS +~~~~~ +'git pi' + DESCRIPTION ----------- diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index e846c2ed7f..a9a096cc8b 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/git-mergetool.txt @@ -10,6 +10,10 @@ SYNOPSIS [verse] 'git mergetool' [--tool=] [-y | --[no-]prompt] [...] +ALIAS +~~~~~ +'git mt' + DESCRIPTION ----------- diff --git a/config.c b/config.c index 57f952c6fd..ce3783aecb 100644 --- a/config.c +++ b/config.c @@ -1198,6 +1198,9 @@ int git_config_early(config_fn_t fn, void *data, const char *repo_config) ret += fn("alias.co", "checkout", data); ret += fn("alias.rb", "rebase", data); ret += fn("alias.st", "status", data); + ret += fn("alias.br", "branch", data); + ret += fn("alias.pi", "cherry-pick", data); + ret += fn("alias.mt", "mergetool", data); if (git_config_system() && !access_or_die(git_etc_gitconfig(), R_OK, 0)) { ret += git_config_from_file(fn, git_etc_gitconfig(), diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh index 6b00e53cd6..c327aa1420 100755 --- a/t/t1300-repo-config.sh +++ b/t/t1300-repo-config.sh @@ -338,6 +338,9 @@ alias.ci=commit alias.co=checkout alias.rb=rebase alias.st=status +alias.br=branch +alias.pi=cherry-pick +alias.mt=mergetool beta.noindent=sillyValue nextsection.nonewline=wow2 for me 123456.a123=987 @@ -353,6 +356,9 @@ alias.ci=commit alias.co=checkout alias.rb=rebase alias.st=status +alias.br=branch +alias.pi=cherry-pick +alias.mt=mergetool EOF test_expect_success '--list without repo produces empty output' ' @@ -365,6 +371,9 @@ alias.ci alias.co alias.rb alias.st +alias.br +alias.pi +alias.mt beta.noindent nextsection.nonewline 123456.a123 @@ -945,6 +954,9 @@ alias.ci=commit alias.co=checkout alias.rb=rebase alias.st=status +alias.br=branch +alias.pi=cherry-pick +alias.mt=mergetool section.continued=continued section.noncont=not continued section.quotecont=cont;inued @@ -969,7 +981,10 @@ alias.ci commitQalias.co checkoutQalias.rb rebaseQalias.st -statusQsection.sub=section.val1 +statusQalias.br +branchQalias.pi +cherry-pickQalias.mt +mergetoolQsection.sub=section.val1 foo=barQsection.sub=section.val2 foo barQsection.sub=section.val3 @@ -1271,6 +1286,9 @@ test_expect_success '--show-origin with --list' ' command line: alias.co=checkout command line: alias.rb=rebase command line: alias.st=status + command line: alias.br=branch + command line: alias.pi=cherry-pick + command line: alias.mt=mergetool file:$HOME/.gitconfig user.global=true file:$HOME/.gitconfig user.override=global file:$HOME/.gitconfig include.path=$INCLUDE_DIR/absolute.include @@ -1291,7 +1309,10 @@ test_expect_success '--show-origin with --list --null' ' commitQcommand line:Qalias.co checkoutQcommand line:Qalias.rb rebaseQcommand line:Qalias.st - statusQfile:$HOME/.gitconfigQuser.global + statusQcommand line:Qalias.br + branchQcommand line:Qalias.pi + cherry-pickQcommand line:Qalias.mt + mergetoolQfile:$HOME/.gitconfigQuser.global trueQfile:$HOME/.gitconfigQuser.override globalQfile:$HOME/.gitconfigQinclude.path $INCLUDE_DIR/absolute.includeQfile:$INCLUDE_DIR/absolute.includeQuser.absolute diff --git a/t/t1305-config-include.sh b/t/t1305-config-include.sh index 6f9e84b6c0..8977124fbf 100755 --- a/t/t1305-config-include.sh +++ b/t/t1305-config-include.sh @@ -53,6 +53,9 @@ test_expect_success 'listing includes option and expansion' ' alias.co=checkout alias.rb=rebase alias.st=status + alias.br=branch + alias.pi=cherry-pick + alias.mt=mergetool include.path=one test.one=1 EOF diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index d585f376f2..6c618694b6 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -399,6 +399,9 @@ test_expect_success '__git_aliases' ' co rb st + br + pi + mt ci co EOF -- 2.32.0.93.g670b81a890