git-alias

Is there a way to write an alias that merges a branch back to its parent? I know I can do: git checkout - && git merge - But it only works in simple cases when my previous branch is the parent branch. As far as I know git does not track this kind of information because there is no branches in there. But I hope it's already implemented as a plugin or a hookset. Thanks in advance. VonC Such an alias would involve first finding the "parent" branch. It isn't trivial, and the question " Find the parent branch of a branch " has some good solutions. Git’s history is based on a DAG of commits.

I set up a git alias like this: git config --global alias.popmerge '!git stash pop && git merge master' Then I call it, like this: git popmerge The " git stash pop " is executed, but the " git merge master " is ignored. If I run " git merge master " right after the " git popmerge "... it sumply runs as expected, performing the merge. I have other aliases with long sequences of commands... and they run flawlessly. It seems something at " git stash pop " makes the alias process to halt ... Is it possible to avoid this behavior? How? Thanks. sehe Have you checked the exit code from stash pop? &&

As you can see from this excerpt, there is a "!" before the git command. What's the point? [alias] commitx = !git add . && git commit - https://stackoverflow.com/a/8956546/1354543 I understand aliases and what the command itself is doing, but not the point of the "!" before the git command. The ! means "run the following as commands to the shell", so in this case the alias git commitx expands to the equivalent of running git add . && git commit (which is a terrible terrible idea) An important aspect of ! not covered by the accepted answer is that for the shell command, the working directory is

I often rebase feature branches and then want to force push them to the server. git push --force origin feature-mongodb-support Is there any shortcut for git push --force origin <current branch> ? You can use aliases to shorten the command. Use it like this: git config --global alias.fpush "push --force origin" Now to push your branch just type: git fpush feature-mongodb-support Or you can even hardcode the branch name into the command: git alias fpush "push --force origin feature-mongodb-support" and use only git fpush to push your precious work into the upstream. However, non-fast-forward

I'd like the command git co to be the same as typing git checkout . A normal Bash alias ( alias co='checkout' ) doesn't work. The command: git config --global alias.co checkout will create a git alias to do that. It will add the following entry into your global ~/.gitconfig file: [alias] co = checkout sma Also, can edit this into your git config: [alias] co = checkout 来源： https://stackoverflow.com/questions/14489109/how-to-alias-git-checkout-to-git-co