help in git

[Sayantan Datta]

hi,

I have my local repository of digikam. I made some local commits which were later submitted as patches to the remote git repository. I made a git pull and it shows all up-to-date while the git status shows that i am ahead by 5 commits. How do I make my local branch master = remote/origin ??

Extra Details are shown below :

===============================================================

[sayantan@ core]$ git pull origin master
From http://anongit.kde.org/digikam
 * branch            master     -> FETCH_HEAD
Already up-to-date.

===============================================================

[sayantan@ core]$ git merge FETCH_HEAD
Already up-to-date.

===============================================================

[sayantan@ core]$ git status
# On branch master
# Your branch is ahead of 'origin/master' by 5 commits.
#   (use "git push" to publish your local commits)
#
nothing to commit, working directory clean

===============================================================

[sayantan@ core]$ git pull origin master
From http://anongit.kde.org/digikam
 * branch            master     -> FETCH_HEAD
Already up-to-date.

===============================================================
[sayantan@ core]$ git branch -a -v
* master                           5657a08 [ahead 5] their files
  remotes/origin/HEAD              -> origin/master
  remotes/origin/development/0.10  ef054bc Merge to 675264
  remotes/origin/development/0.8   afcfc53 Aspect Ratio Crop & Composition Guide digiKam tool : Changing dialog layout "à la PowerRetouche" !!! A screenshot :
  remotes/origin/development/0.8.x 5dd3f69 SVN_SILENT made messages (.desktop file)
  remotes/origin/development/0.9.x 95fc4f7 SVN_SILENT made messages (.desktop file)
  remotes/origin/development/1.2   6872363 merged with trunk r1083192
  remotes/origin/development/1.3   15f6ab3 Merged with trunk r1108734.
  remotes/origin/development/3.0.0 1e06a3e new deprecated method fixed in core editor
  remotes/origin/gsoc/clone        fbf034d update
  remotes/origin/kde3              d1e1bd9 update
  remotes/origin/libkface          cc037c3 get face data from catcher instead of opencv methods
  remotes/origin/master            956d57d update
  remotes/origin/picassafacetag    1361f9e Merge branch 'master' into picassafacetag
  remotes/origin/sok/presentation  c457b50 Metadata at bottom-left corner + one icon
  remotes/origin/sql/2.0           e17eeff Merge remote-tracking branch 'origin/master' into sql/2.0
  remotes/origin/tableview         795cefe Clean up includes.

===============================================================

[sayantan@ core]$ git config -l
url.http://anongit.kde.org/.insteadof=kde:
user.name=Sayantan Datta
user.email=sayant...@gmail.com
core.repositoryformatversion=0
core.filemode=true
core.bare=false
core.logallrefupdates=true
remote.origin.url=kde:digikam
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
branch.master.remote=origin
branch.master.merge=refs/heads/master
[sayantan@ core]$

===============================================================

Waiting for a reply. :)

-----------------------------------------------------------------
Sayantan Datta
Junior Year
National Institute of Technology, Durgapur
Phone : (+91) 9564370661
IRC : kenzo450D on #fedora, #nitdgplug, #kde

[Samikshan Bairagya]

On Sat, Apr 6, 2013 at 11:09 AM, Sayantan Datta <kenzo....@gmail.com> wrote:

hi,

I have my local repository of digikam. I made some local commits which were later submitted as patches to the remote git repository. I made a git pull and it shows all up-to-date while the git status shows that i am ahead by 5 commits. How do I make my local branch master = remote/origin ??

Hey!

Are you sure that you have updated origin/master with your local commits?

This can only happen when you have local commits which are not yet pushed

upstream. Also there is an useful application called gitk. You might want to
install it as it allows you to "visualise" your branches and commits through

a GUI.

Hope that helps.

--
Regards,
Samikshan Bairagya
KDE Developer, India
http://samxan.wordpress.com | http://about.me/samikshan

[Sayantan Datta]

On Sat, Apr 6, 2013 at 11:34 AM, Samikshan Bairagya <sami...@gmail.com> wrote:

On Sat, Apr 6, 2013 at 11:09 AM, Sayantan Datta <kenzo....@gmail.com> wrote:

hi,

I have my local repository of digikam. I made some local commits which were later submitted as patches to the remote git repository. I made a git pull and it shows all up-to-date while the git status shows that i am ahead by 5 commits. How do I make my local branch master = remote/origin ??

Hey!

Are you sure that you have updated origin/master with your local commits?

This can only happen when you have local commits which are not yet pushed

upstream. Also there is an useful application called gitk. You might want to
install it as it allows you to "visualise" your branches and commits through

a GUI.

Hope that helps.

Well, i here is the thing, i want to disregard my local commits. Like make another clone but on this same repository. The commits were pushed, but they were modified a bit, like extra spaces and all.
 

--
Regards,
Samikshan Bairagya
KDE Developer, India
http://samxan.wordpress.com | http://about.me/samikshan

--
You received this message because you are subscribed to the Google Groups "GNU/Linux Users' Group, NIT Durgapur" group.
To unsubscribe from this group and stop receiving emails from it, send an email to nitdgplug+...@googlegroups.com.
To post to this group, send email to nitd...@googlegroups.com.
Visit this group at http://groups.google.com/group/nitdgplug?hl=en.
For more options, visit https://groups.google.com/groups/opt_out.
 
 

[anoop chaurasiya]

git reset --hard origin/master
this way u will loose everything u have locally, I assume u already
made a patch for ur local commits so u r safe.

--
Anoop Chaurasiya
CSE (2008-2012)
NIT DGP