Hello,

at step 4 I would do a rebase instead of a merge. This way when you merge
your local changes to master in step 6, you can do an interactive rebase,
and squash all your local commits into one general commit. I don’t see your
problem though, why is it a problem that your changes appear as multiple
commits?

Cheers,
Gergely


On 17 January 2014 12:19, Tony M <tonyson...@gmail.com> wrote:

> Hi All,
>        I have a personal branch of the master branch and work in my
> personal branch. Once I have a feature ready in my branch, I pull the
> latest from the master branch(which is updated by other users as well), and
> then merge the latest to my branch then push my branch to master (I know it
> is confusing. Let me explain step by step).
>
> 1) I make multiple changes on Local branch, which has multiple changes
> spanning over multiple days.
> 2) Once I feel the feature I work on is ready to be pushed to master, I
> decide to push it to master.
> 3) Update my local branch of master (git pull). This will have changes
> pushed by other users to the master
> 4) Merge the master to my local branch (git merge master )
> 5) Push my local branch to repository.
> 6) Merge local branch to local master (git merge localBranch)
> 7) Push local master to repository.
>
>                      Now the problem, I have is in the master branch, all
> the commits from my local branch are spread out in a chronological order
> (in between changes others have made). So after few days, if I want to
> trace the change I made, it is quite hard. Is it possible to have the merge
> to the master as a single commit, so that I can just look at the single
> commit which has all the commits in my local branch (and also see all the
> files I changed in that merge). I read the description of git merge
> --no-commit. But am not sure whether that is what I am looking for.
>
> Thanks,
> Tony
>
>  --
> You received this message because you are subscribed to the Google Groups
> "Git for human beings" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to git-users+unsubscr...@googlegroups.com.
> For more options, visit https://groups.google.com/groups/opt_out.
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to