From: Rocky Ji <rockyji3438@gmail.com>
To: git@vger.kernel.org
Subject: How to update Git's metadata without affecting working dir?
Date: Fri, 17 May 2019 22:34:31 +0530 [thread overview]
Message-ID: <CAN2Gq-Rb3v8-8PKmKUGKJ3wP-UvAF2n59a9UGbtjiGibE8q=zg@mail.gmail.com> (raw)
I am working individually at the moment.
I have the habit of committing related changes on a regular basis, but
I push to GitLab only at the end of class session.
-------Events to reproduce the situation--------
Thursday, in school:
- `git clone https://gitlab.../my-repo`
- create a few .rst documentation files
- commit the above changes before I `git push -U origin master`
Friday, in school:
- start working on new feature, create a test file `test_A.rb`
- I commit the changes but forget to push
Sunday, **in home**:
- I `git clone https://gitlab.../my-repo`
- work on the exciting new feature that popped in my head, create `feature.rb`
- commit the changes before I `git push -U origin master`
Monday, in school:
- running `git status` shows `Your branch is ahead of 'origin/master'
by 1 commit.`
--------end problem reproduction----------------
Questions I have
1. What will happen if I follow Git's recommendation `use "git push"
to publish your local commits`?
2. How do I resolve this situation? I don't want loose any information
i.e. preserve `test_A.rb` and `feature.rb` along with their commit
messages and timestamps.
3. Why does Git assume that local-working-dir is "ahead" without
consulting the Gitlab server first?
4. How to make Git "consult" (but not mess the working-dir) GitLab
repo before starting my day's work?
Thank you.
next reply other threads:[~2019-05-17 17:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-17 17:04 Rocky Ji [this message]
2019-05-17 20:54 ` How to update Git's metadata without affecting working dir? Philip Oakley
[not found] ` <CAN2Gq-RNt2x-023qC2LWawYGUz5g08=oVK+ub4iLGnh90aQdyQ@mail.gmail.com>
2019-05-18 8:29 ` Rocky Ji
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAN2Gq-Rb3v8-8PKmKUGKJ3wP-UvAF2n59a9UGbtjiGibE8q=zg@mail.gmail.com' \
--to=rockyji3438@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).