[git-users] Clean all commits before a merge.
Hello, I contribute to [this project](https://github.com/GCorbel/smart_listing). I did a first pull request and I want to continue but now, when I submit my changes, it want to replay all commits from the beginning, including the first pull request. This is the graph version of commits : * 3cc0de2 (origin/master, simplify_api) Remove the spec directory in the dummy app * fbd8a0d Merge master and pull request |\ | * 61cad2d (HEAD, upstream/master, master) Feature spec * | 0b14747 Refactor #smart_listing_create * | e49c522 Use the controller name by default * | a1c1a92 Remove the spec directory in dummy app * | 4128104 Remove gems from Gemfile and add it in gemspec * | 970f363 Add spec for #smart_listing * | 098fcfe Add specs for #smart_listing_create * | 6a4229e follow convention for hashes * | a697f46 Add specs for array * | 6fed166 Add specs for page * | 8839d44 Add specs for non Array collection * | cf03ff3 Add specs for the memorization of per_page * | e6d79f1 Dont change the global settings * | eddc5dd Use a method to build lists * | 98e41bb Add tests for sort * | a783979 Add tests for per page value * | cfa2f6d Add a spec to search * | 86731d6 Add some specs for manage items * | 811eac9 Add spec to manage items * | a3db478 Add a test for sortable items * | b172eb9 Ignore tags file * | 7ecb856 Add the first feature spec * | c0b6a55 Make a simple app using smart_listing * | d7c93d7 Add simple MVC item * | e67e444 Add a dummy app * | 721817f Ignore some files |/ * 89e24b6 Add missing update_list event The commit 61cad2d include all commits made before 970f363. Git say "This branch is 27 commits ahead of Sology:master" but it's not real because I made only 4 commits since the merge. Is it possible to replay only the changes I made since 4128104 and clean older commits? -- 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/d/optout.
Re: [git-users] Tracking Remote Branch Scenario
On Fri, 7 Nov 2014 14:30:05 -0800 (PST) Baus wrote: [...] > *Then I run the command* > $ git branch -u origin/master > Branch rel_010115 set up to track remote branch master from origin. [...] > Local branches configured for 'git pull': > master merges with remote master > rel_010115 merges with remote master > rel_121214 merges with remote rel_121214 > Local refs configured for 'git push': > master pushes to master (up to date) > rel_010115 pushes to rel_010115 (up to date) > rel_121214 pushes to rel_121214 (local out of date) > > *I see that my pull has changed to master but not my push. What am I > missing or misunderstanding?* Making a local branch "track" a remote branch means defining for that local branch an "upstream" branch from which it should *merge.* Basically, the command you've run added something like this to the local configuration (.git/config file): [branch "rel_010115"] remote = origin merge = refs/heads/master Note that there's no "push = " or something like this. Instead, to define the way the local branches are pushed when the user does not explicitly specify what to update with what, you should tweak the push.default configuration option. It has lots of values, and the current default with git < 2.0 is "matching" which means only branches already existing in the remote repo with names those of local branches are pushed. Git 2.0 changed this default to "simple". I strongly urge you to read the gitconfig manual page, searching for the options starting with "branch." and also study the section on push.default. I reckon the reason for Git having these things working the way they are is that Git wasn't created with the centralized workflow in mind (in which you only ever push to a single repository, and always to the branch you've based your local branch on). The results you're observing is due to your push.default being defaulted (or set explicitly) to "matching". Switch it to "upstream" or "simple" (for Git >= 1.9) to make relations between your refs for pushing look the way you want them. -- 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/d/optout.
Re: [git-users] http access
What I thought my question was... If my repos are in /var/git (ie /var/git/project.git and /var/git/project2), shouldn't Apache have been able to to serve that directly from my configuration? It didn't. The only way to make it work was to create the symlink /var/git => /var/www/html/var/git That just seemed to be wrong. The other issue - not addressed in the first question was that Apache would just provide access regardless whether the user was in the .htpasswd file or not and thus authentication didn't work and I thought I followed the directions. I am not back at work until tomorrow however. Thanks On Sunday, November 9, 2014 10:14:45 AM UTC-7, Konstantin Khomoutov wrote: > > On Fri, 7 Nov 2014 13:03:08 -0800 (PST) > Craig White > wrote: > > > My final target is actually https and likely using mod_authz_ldap but > > I am doing baby steps. This is an RHEL 6.5 box > [...] > > Configuration that is working looks like this but it is clumsy - what > > am I doing wrong? > [...] > > You did not tell what your immediate target it and what precise > symptoms of it not being achieved are -- I mean, what Git commands you > run, what are their expected outcomes, how they fail instead what are > error messages on the Git and Apache side etc. > > Instead you've just presented one bit of Apache configuration. > I fail to see a problem statement and a question. > -- 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/d/optout.
Re: [git-users] http access
On Fri, 7 Nov 2014 13:03:08 -0800 (PST) Craig White wrote: > My final target is actually https and likely using mod_authz_ldap but > I am doing baby steps. This is an RHEL 6.5 box [...] > Configuration that is working looks like this but it is clumsy - what > am I doing wrong? [...] You did not tell what your immediate target it and what precise symptoms of it not being achieved are -- I mean, what Git commands you run, what are their expected outcomes, how they fail instead what are error messages on the Git and Apache side etc. Instead you've just presented one bit of Apache configuration. I fail to see a problem statement and a question. -- 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/d/optout.
