Jacek,
Two quick comments:

- The first time you do 'git push origin tickets/....', add the -u switch. That way you can simply do 'git push' from then on.

- instead of multiple checkouts and pulls before rebase, you could just do:

git fetch origin
git rebase -i origin/master

(the -i is not necessary per se but will let you interactively clean up the history).
--
Sent from my Android device with K-9 Mail. Please excuse my brevity.

On May 20, 2014 11:47:13 PM CEST, Jacek Becla <[log in to unmask]> wrote:
P.S. I'll add a section about squashing later



On 05/20/2014 02:44 PM, Jacek Becla wrote:
 Please see

 https://dev.lsstcorp.org/trac/wiki/db/Qserv/gitMerging

 I am hoping to hear comments from our local git gurus.

 We will discuss tomorrow.

 Jacek

 ########################################################################
 Use REPLY-ALL to reply to list

 To unsubscribe from the QSERV-L list, click the following link:
 https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=QSERV-L&A=1


########################################################################
Use R!
 EPLY-ALL
to reply to list

To unsubscribe from the QSERV-L list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=QSERV-L&A=1

Use REPLY-ALL to reply to list

To unsubscribe from the QSERV-L list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=QSERV-L&A=1