* Exclude a file from a pull request
@ 2015-10-07 15:55 Rudy YAYON
2015-10-07 16:33 ` Andreas Schwab
0 siblings, 1 reply; 3+ messages in thread
From: Rudy YAYON @ 2015-10-07 15:55 UTC (permalink / raw)
To: git@vger.kernel.org
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Exclude a file from a pull request
2015-10-07 15:55 Exclude a file from a pull request Rudy YAYON
@ 2015-10-07 16:33 ` Andreas Schwab
2015-10-08 0:30 ` Jacob Keller
0 siblings, 1 reply; 3+ messages in thread
From: Andreas Schwab @ 2015-10-07 16:33 UTC (permalink / raw)
To: Rudy YAYON; +Cc: git@vger.kernel.org
Rudy YAYON <Rudy.YAYON.ext@boursorama.fr> 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.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Exclude a file from a pull request
2015-10-07 16:33 ` Andreas Schwab
@ 2015-10-08 0:30 ` Jacob Keller
0 siblings, 0 replies; 3+ messages in thread
From: Jacob Keller @ 2015-10-08 0:30 UTC (permalink / raw)
To: Andreas Schwab; +Cc: Rudy YAYON, git@vger.kernel.org
On Wed, Oct 7, 2015 at 9:33 AM, Andreas Schwab <schwab@linux-m68k.org> wrote:
> Rudy YAYON <Rudy.YAYON.ext@boursorama.fr> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-10-08 0:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-07 15:55 Exclude a file from a pull request Rudy YAYON
2015-10-07 16:33 ` Andreas Schwab
2015-10-08 0:30 ` Jacob Keller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.