I prefer to use rebase instead of merge. Using rebase you´ll be able to take
a look at the whole history.
Try to use rebase --interactive
On Fri, May 15, 2009 at 3:23 PM, Thiago Scalone <
thiagoscaloneso...@gmail.com> wrote:
>
> it is possible to ignore files specifics in the merge?
> >
>
--~-
Do you want to be able to see everything will happen with your repo, like, *
conflicts*, *changes*?
On Fri, May 29, 2009 at 1:25 PM, Matt Haggard wrote:
>
> Is there a way to preview exactly what a git merge will do?
>
> git diff shows me the difference between two commits, but I don't know
> ev
I`ve been using this and never had any problem.
On Wed, Jun 3, 2009 at 7:47 AM, Petr Baudis wrote:
>
> On Tue, Jun 02, 2009 at 12:28:41PM -0700, donnoman wrote:
> > Redmine automatically links those log messages to the ticket when we
> > use this method. It works well for git commit -m "#1234
I think you are confused.
When you clone a repository, after do that you will redirect into the branch
that was active on that project, instead of into your local branch.
Did you understand?
Cheers,
Alberto
*
*On Mon, Jun 8, 2009 at 2:21 PM, harry wrote:
>
> When I clone repos, I am noticiing
my suggestion..
1- create a new branch from master branch.
2- get the project from the server and put it inside the new branch
3 - execute 'git diff' between your new branch and master branch to see the
changes were done
4- choose the code you want to use...
5- execute 'git checkout master' to ju
One way to shrink the repo size is rewriting your branches. Once you get the
biggest files, try to use 'git-filter-branch' to remove them from your
repository.
Wed, Jun 17, 2009 at 9:15 PM, agaelebe wrote:
>
> I'm with the following problem.
>
> I have a git repository in a VPS with 360mb of r
Having a chat along with my co-worker he spoke about git-repack.
Try to use it: git repack --window=50 --depth 100 --window-memory=1g
for more info
man git-repack
On Wed, Jun 17, 2009 at 9:17 PM, Alberto Leal wrote:
> One way to shrink the repo size is rewriting your branches. Once you
Git for human beings" group.
> To post to this group, send email to git-us...@googlegroups.com.
> To unsubscribe from this group, send email to
> git-users+unsubscr...@googlegroups.com
> .
> For more options, visit this group at
> http://groups.google.com/group/git-users?hl=en.
&
Are you sure you want to "delete" the changes you have made on you local
branch? If so, you can use "git revert":
git revert commit
But ensure you will do that starting from the top, for instance:
commit ac3ffa718484cbefe4202d4a7263573a696917e4
Author: Alberto Leal
Date:
