emacs-orgmode
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[O] [git-101] How to push a branch and avoid merge-message? (was: [bug,


From: Rasmus
Subject: [O] [git-101] How to push a branch and avoid merge-message? (was: [bug, patch, ox] INCLUDE and footnotes)
Date: Wed, 24 Dec 2014 19:10:54 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux)

Hi,

Rasmus <address@hidden> writes:

> Please let me know if I did any git mistakes.  Somehow the time got skewed
> up and it's behind some of your commits in cgit. . .

Hmm, inspecting cgit I see that one of those persky merge messages got up
there even though it wasn't in my local git log before pushing.  Sorry!

What is my mistake:

- I wrote the patch locally in a branch called include.
- I did git pull --rebase origin master before pushing.  I then did push
  origin master from my include branch.  I did not merge it into master
  exactly to avoid this merge-message...
- I know I can get a "clean" log by doing git format-patch and then
  git am'ing them into my master.  But this is tedious.

How can I develop on branch, retain history and not get the merge message?

Thanks,
Rasmus

PS: I did some searching on the webs beforehand, but apparently not well
    enough.

-- 
A clever person solves a problem. A wise person avoids it




reply via email to

[Prev in Thread] Current Thread [Next in Thread]