[PATCH] There was a little inconsistancy in git prompt
--- contrib/completion/git-prompt.sh | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index 07b52be..18be99f 100644 --- a/contrib/completion/git-prompt.sh +++ b/contrib/completion/git-prompt.sh @@ -194,13 +194,13 @@ __git_ps1_show_upstream () "") # no upstream p="" ;; "0 0") # equal to upstream - p="=" ;; + p=" =" ;; "0 "*) # ahead of upstream - p=">" ;; + p=" >" ;; *" 0") # behind upstream - p="<" ;; + p=" <" ;; *) # diverged from upstream - p="<>" ;; + p=" <>" ;; esac else case "$count" in -- https://github.com/git/git/pull/181 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Exclude a file from a pull request
Hi all, I have a concern with r10k used by Puppet. r10k is a Puppet tool based on the git workflow. My concern is that one important file (Puppetfile) needs to be pushed to my remote repository so I can check the changes I commited. To do that, I need to commit changes (included to the Puppetfile) then I need to push it to the remote repository. Once I want to merge these changes from a specific branch to the master branch, I do NOT want to include this file. In other words, I want to merge all files except the Puppetfile file. What is the best way for you to do that? Reminder: I can't ignore the file as I have to push it to the remote repository (origin) Regards, Rudy YAYON -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Exclude a file from a pull request
On Wed, Oct 7, 2015 at 9:33 AM, Andreas Schwab wrote: > Rudy YAYON writes: > >> My concern is that one important file (Puppetfile) needs to be pushed to >> my remote repository so I can check the changes I commited. >> To do that, I need to commit changes (included to the Puppetfile) then I >> need to push it to the remote repository. >> >> Once I want to merge these changes from a specific branch to the master >> branch, I do NOT want to include this file. In other words, I want to merge >> all files except the Puppetfile file. >> >> What is the best way for you to do that? > > Create a branch that does not include the file. > > Andreas. > Why do the changes to "Puppetfile" need to be pushed to your github? Just test it locally and then push it and pull-request a commit which doesn't have those changes in it. Regards, Jake Hi Jake, Actually, once I run r10k, it will grab the Puppetfile from each branch from the remote repository to create Puppet environments (per git branch) and deploy other remote repositories. This file is mandatory on the repository. Regards, Rudy YAYON-- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
