git rebase without changing commit timestamps
Would it make sense to perform
git rebase while preserving the commit timestamps?
I believe a consequence would be that the new branch will not necessarily have commit dates chronologically. Is that theoretically possible at all? (e.g. using plumbing commands; just curious here)
If it is theoretically possible, then is it possible in practice with rebase, not to change the timestamps?
For example, assume I have the following tree:
master <jun 2010>
: oldbranch <feb 1984>
oldcommit <jan 1984>
Now, if I rebase
master, the date of the commit changes from feb 1984 to jun 2010. Is it possible to change that behaviour so that the commit timestamp is not changed? In the end I would thus obtain:
oldbranch <feb 1984>
master <jun 2010>
Would that make sense at all? Is it even allowed in git to have a history where an old commit has a more recent commit as a parent?
I'm reading about using git as an svn client here: http://learn.github.com/p/git-svn.html That page suggests that you do git svn rebase before git svn dcommit, which makes perfect sense; it's like doi
I need to make some commits using Git but I would like the timestamp in git-log to be in the future. How can I do a commit in git that causes a future timestamp to register in the git-log?
Having run the following commands: git init touch README git add README git commit -m Initial Commit git branch b01_02_03 git checkout b01_02_03 echo Data 1 >> f1 && git add f1 &
Suppose you have: A-B-C Now your build/test fails. The fix should be merged in A. My current work-flow is like this: $ git commit -m fixA A-B-C-fixA $ git rebase -i A~1 And squash fixA in A, resul
I'm currently working a very simple git workflow using feature branches and rebasing on to master before pushing. git checkout -b feature .. make some commits git checkout master git pull If there a
I have a local branch work, where I created two new files a.py, b.py and committed them. Then, instead of doing git rebase origin/master, I accidently typed git rebase origin master, and now the c
I've seen lots of people talk about git rebase and what it does, e.g. Hg: How to do a rebase like git's rebase and people talk about what it achieves (gives linear history), e.g. here Git rebase loses
How can I combine 1st commit with 4th commit in git using 'git rebase'. From what I read here http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html, the 'squash' command in 'git r
On OSX, often I go to the git log in order to find a commit, usually a few back, copy it with my mouse, then rebase off of that. How can I do this easily without using my mouse or memorizing it?
Hi I successfully removed a vile commit using: git rebase -p 0df8fg5^ 0df8fg5 I am working on the mater branch. However now when I: git push It gives: To firstname.lastname@example.org:my_user/my_repo.git ! [rejected
I'm using a git submodule (let's call it SubmoduleRepo) so that I can include my module in couple of projects. I can commit to SubmoduleRepo from any project that uses it. I can update, commit and pu
Let's assume that I'm on a feature branch, created off master. I do a commit Fix XYZ whose SHA is, let's say, 389b04. Then, I do another commit, in whose commit message I mention the previous SHA. Fi
After git pull I have done git reset hard to undo the merge with commit id before merge.Somehow my entire commit is gone and I cant the see the commit in history also. But I have the commit id , on gi
this may be a partially unique scenario here, but i want to rebase, and feel i might break the stage repo branch. note, im the only developer, no worries about any other developers having these che
I wanted to reword a commit in git so I did a git rebase -i 00112233 or something similar and I get merge conflicts without making any changes to the commits that will be applied. I enter the merge co
I'm working alone on a Git repository for months. I'd like now to push my commits to a public repository, however, I'd like to improve the commit messages (mainly translate them to English). I know I
I am new to git and I want to start doing things 'properly'. I quite like this flow: git checkout -b featurebranch git commit -m some changes // manytimes * git pull // update master to origin's hea
I have a repository with various commits which I want merged in two patches. One patch introducing the feature and another changing the existing code to use it. Problem is, when I was coding and commi
I'm trying to rebase a commit. However, any time I run git rebase -i f83eff3ffc8, for example, a MacVim window opens, that's empty (there is no information in the file). Then once I write and close th
This question already has an answer here: Hg: How to do a rebase like git's rebase 4 answers Is there a Mercurial equivalent of git pull --rebase?
I'm really not a git expert. usually I only use -git add -A then git commit -mmsg then git push and this way everything works just fine. This time for change, another use made a commit to my p
Suppose this: mkdir test; cd test echo 1 > file1; git init; git add .; git commit -m initial - file 1 # 1st commit on master echo 2 > file2; git add .; git commit -m file 2 # 2nd commit
I have the following situation: I created a clone(Y) from a main repository(X), because there were many people working on Y we didn't do any rebase but only merges. When we want to deliver(push) Y to
I'm in the middle of a rebase of my master to a stage branch git checkout stage git rebase master At some time I deleted two files then modified the two files according to GIT. warning: too many file
I don't get the difference between git rebase origin and git rebase origin/master. In my case I cloned a git repository twice. In the first clone I have to use git rebase origin and in the other clone
I'm trying to rebase a branch on top of master, something I've done a thousand times before. But today, it's not working: > git status On branch mystuff Your branch and 'master' have diverged, and
I am trying to squash a commit which is at HEAD into one that is a few back. When I run git rebase -i HEAD~7, however, I am presented with just a noop in the editor! I am totally confused about how th
What is the difference between these two commands? git commit -m added a new page and git commit -a -m added a new page I know that the -a option will stage files that have been modified and del
Is there a way to have git warn you before finishing a commit, if the commit message does not contain a GitHub issue number?
I have the hash for a git commit I made a few weeks ago. I tried checking it out but it says that the hash did not match any file(s) known to git. I also looked for it in git reflog, but don't see i
Looking at the git-rebase man page, I didn't see any diagrams that looked like what I want (except some seem to do the reverse of what I want), and playing around with --onto didn't get me what I want
After I do a git rebase, the code lines I have added/modified are indented four spaces or more to the left of the respective code block. This is incredibly annoying and time-consuming to fix, not to m
I managed to create a little mess in my local git repository. I was trying to fix a broken commit by using the following instructions. Before running the git commit --amend (and after the git rebase
I am getting the following error after running git svn rebase: 'update-index --refresh: command returned error: 1' Any ideas? Below is the entire output. $ git svn rebase --dry-run xxx-iphone/xxx_prot
I'm using git rebase -p -i SHA1^ And moving a single commit backwards in time to just after SHA1. The commit consists of a WAV file, so there's no way this is breaking my code. Seemingly unrelated
I rebase another branch onto my checkout branch and I get a conflict during rebase. i resolved the merge conflict. $ git status rebase in progress; onto 77c951b You are currently rebasing branch 'test
What are git commit generation numbers (hacker news link) and what are their significance?
I would say I do not understand the behavior of Git p4 rebase command at all. From the document and source code of git-p4 command, it just does a git p4 sync to update refs/remotes/p4/master branch
I'm trying to figure out why rebase requires a three-way merge. For instance, if we have A1 - A2 \ B1 And I've checked out B1, and I want to perform: git rebase A2 why does git merge A2, B1 AND A1
I tried a rebase of my local branch (call it 'local') into master. Here is what I did: $ git checkout local $ git rebase -s ours master First, rewinding head to replay your work on top of it... ... Al
I am using mac os, git(without github), gitolite as git server and pivotal tracker. I would like to add git hook which notify pushed commit for ex: [#432324] some commit will add as a comment to PT s
When I encounter a merge conflict using git rebase, how can I identify the source of the conflict in terms of commits, rather than just file differences? I already know how to make (basic) use of git
I am now in the middle of branch rebase (conflicts stage) and I want to skip some commits using git rebase --skip. However I am wondering how to check what commit is actually being applied to the work
I am trying to commit all my changes by using following command git commit -a Note : I want to commit without any commit message but when I execute above command it shows me the screen shown below
When I use git commit --amend or git rebase -i, vim opens up for me to make changes. If I then change my mind and exit vim without making any changes, a commit is still made which shows up in git refl
This is the output of my 'git log'. But when I do a 'git pull' , the top commit causes conflict. So I did a 'git rebase -abort' commit 7826b25db424b95bae9105027edb7dcbf94d6e65 commit 5d1970105e8fd2c7b
We recently switched to git and are trying to use Submodules to include our Common libraries. No matter what we do we can not get 'git pull --rebase' to work in the Super or Submodule. We get: james:
In the git-config documentation the information about pull.rebase: pull.rebase When true, rebase branches on top of the fetched branch, instead of merging the default branch from the default remote
Im having some conflicts on a branch when rebasing master into it. Scenario is: Branch off master, make some changes, commit said changes. Checkout master, make some changes, commit said changes, che
I have this following scenario that keeps coming back: I commit a change in some files, along with an update to a submodule. Someone else commits and pushes an update to the same submodule. git pull