rebase - git autosetuprebase is not working? -


i have set git 

git config --global branch.autosetuprebase

and looks ok in ~/.gitconfigfile:

[branch]     autosetuprebase =

yet when 

git pull

he performs merge (i removed company specific data):

from gitlab:***/***     8fd1d96..0d064a3  master     -> origin/master  * [new tag]         *** -> *** merge made 'recursive' strategy.

why doesn't perform rebase? note thing pulled remote tag , minor code change in file not changed locally...

edit: have git version 1.8.4.5

edit: local .git/config file:

[core]         repositoryformatversion = 0         filemode = true         logallrefupdates = true [branch "master"] [remote "origin"]         url = git@gitlab:***/***.git         fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"]         remote = origin         merge = refs/heads/master

the branch.autosetuprebase option in git affects branches created after set. manual page (git config):

  branch.autosetuprebase        when new branch created git branch or git checkout tracks branch, variable        tells git set pull rebase instead of merge (see "branch.<name>.rebase"). when never, rebase ...

for branches exist, e.g. master, there git config branch.master.rebase true, can scripted multiple branches/repos if necessary.


Comments

Post a Comment

Popular posts from this blog

apache - Remove .php and add trailing slash in url using htaccess not loading css -

i have add following code htaccess file removing .php extension , add trailing slash urls. worked fine reduced page loading speed , css code not loading @ all. pages ugly. please help rewriteengine on rewritebase / ## hide .php extension snippet # externally redirect /dir/foo.php /dir/foo rewritecond %{the_request} ^[a-z]{3,}\s([^.]+)\.php [nc] rewriterule ^ %1/ [r,l] # add trailing slash rewritecond %{request_filename} !-f rewritecond %{request_uri} !/$ rewriterule . %{request_uri}/ [l,r=301] # internally forward /dir/foo /dir/foo.php rewritecond %{request_filename} !-d rewritecond %{request_filename}.php -f rewriterule ^(.*?)/?$ $1.php [l] we can rewrite urls using .htaccess files. before writing in .htaccess files need verify kind of server using. can check server adding a <?php phpinfo(); ?> in php page. ensure mod_rewrite module enabled in apache server. can identified checking phpinfo included page. common methods used url rewriting follows ...
Read more

javascript - jQuery show full size image on click -

pretty self explanatory not workking . i want display full image when user click on image... yes know there tons of plugins but i want keep simple. any idea ? css : .full { display: none; width: 500px; height: 500px; margin-left: 100px; margin-top: -300px; position: fixed; background-color: #f00; z-index: 6; } .thumbnail { width: 50px; height: 50px; } html: <img class="thumbnail" src="http://4.bp.blogspot.com/-uhbdp2esxng/txneptvi92i/aaaaaaaaaky/upfqis7zto0/s1600/rihanna-wallpaper.jpg"> jquery: $(document).ready(function() { $('.thumbnail').on('click', function() { var img = $('<img />',{src:this.src,'class':'full'}); $('.full').html(img).show(); console.log('done!'); }); }); try looking how jquery works. $(document).ready(function() { $('.thumbnail').on('click', function(...
Read more