adonthell-general
[Top][All Lists]
Advanced

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

[Adonthell-general] [maybe slightly OT] Git pull origin master


From: shirish शिरीष
Subject: [Adonthell-general] [maybe slightly OT] Git pull origin master
Date: Thu, 16 Dec 2010 02:16:21 +0530

Hi all,
Few queries,

1. I was going through the git help and saw

Updating a local branch from the remote server :-

git pull

It seems to function the same as your longer version on http://bit.ly/dMsY1F

run
 git pull origin master
from time to time to update your clone to the most recent version.

Perhaps you are doing that so that people shouldn't by mistake do
something stupid, could you clarify ?

2. Does GIT have something like $ svn info . Taking example of another
FOSS game project I like :-

$ svn info
Path: .
URL: https://dawn-rpg.svn.sourceforge.net/svnroot/dawn-rpg/trunk
Repository Root: https://dawn-rpg.svn.sourceforge.net/svnroot/dawn-rpg
Repository UUID: b4d8fe5f-8a90-43c9-9084-dcb629e63849
Revision: 697
Node Kind: directory
Schedule: normal
Last Changed Author: arnestig
Last Changed Rev: 697
Last Changed Date: 2010-12-14 03:52:13 +0530 (Tue, 14 Dec 2010)

If something like this is available in GIT please lemme know. I did
try to read few of the Git cheat sheets but none of them talk of this
thing. I'm sure its there somewhere I just don't know it. These are
the things I tried.

a. :/usr/local/src/adonthell$ git pull origin master
>From git://github.com/ksterker/adonthell
 * branch            master     -> FETCH_HEAD
Already up-to-date.

b. /usr/local/src/adonthell$ git show master
commit 83ed46469f327a78d3dc839019797ebf56fee470
Author: Kai Sterker <address@hidden(none)>
Date:   Sun Dec 12 13:28:32 2010 +0100

    ADDED scrollbar/indicator widget
    ADDED image/canvas widget
    REMOVED caching of decoration
    SPLIT decoration into border and background that can be rendered separatel

diff --git a/src/gfx/drawing_area.h b/src/gfx/drawing_area.h
index 01d9594..9451a40 100644
--- a/src/gfx/drawing_area.h
+++ b/src/gfx/drawing_area.h
@@ -158,8 +158,8 @@ namespace gfx
         {
                x_ += da.x();
                y_ += da.y();
-               w_ = da.x() + da.length() < w_ ? w_ - da.x() - da.length() : 0
-               h_ = da.y() + da.height() < h_ ? h_ - da.y() - da.height() : 0
+               w_ = da.x() + da.length() < w_ ? w_ - (da.x() + da.length()) :
+               h_ = da.y() + da.height() < h_ ? h_ - (da.y() + da.height()) :
         }

I had played around with git some years ago, memory got refreshed that
git has some long gibberish number that humans can't understand. I am
talking about commit 83ed46469f327a78d3dc839019797ebf56fee470

I do remember reading somewhere that git has full working history so
probably/possibly I could find or see how how changes had been
happening (as in time between two commits and usually when and stuff
like that). Is there some sane way to read stuff or the only way is to
use this and use the hint of date and time to know what happened ?

3. Let's say there is some cmd and I do get the info (something
similar to above) and I put these details in the same directory as the
game directory just for example say a file which has "Sun Dec 12
13:28:32 2010 +0100" indicating the last time when the commit had
changed and some other details. This is just for the self (to keep
note/history of when I'm downloading stuff etc.) Whenever I do an 'git
pull' or 'git pull origin master' it won't disturb the file and it
won't disturb the directory structure which we are clong, right ?
Please note that the file is nothing but notes for self.

Looking forward to ideas,suggestions and solutions for the above.
-- 
          Regards,
          Shirish Agarwal  शिरीष अग्रवाल
  My quotes in this email licensed under CC 3.0
http://creativecommons.org/licenses/by-nc/3.0/
http://flossexperiences.wordpress.com
065C 6D79 A68C E7EA 52B3  8D70 950D 53FB 729A 8B17



reply via email to

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