git-rebase

Questions : How are several people meant to work with GIT? Is update-commit usual as in SVN or is merge the default? When merging, who should appear as the author of the merging commit? A lot of background information : I am writing a paper on LaTeX with another guy and we are using GIT for the version control. From the start we decided we both would work on the master branch, because we are anyway only two people. I've done a number of commits. Then he did a commit over an old version and merged my last version and the most recent one (after his commit). This is easier to see with a picture:

I have some trouble using the --keep-empty option of git rebase , and I'm not sure whether I'm misunderstanding what this option does, or there's a bug. Here is a minimal example: Setup Create a new Git repository and an initial, unrelated commit. $ git init $ echo something >base.txt $ git add base.txt $ git commit -m 'some base commit to not run into the root corner case' Create a new commit which adds two new files. $ echo A >a.txt; echo B >b.txt $ git add a.txt b.txt $ git commit -m 'add A and B' Modify one of the files. $ echo A1 >a.txt $ git add a.txt $ git commit -m 'change A' Modify

I think I understand git pull and this is how I explain it in, what I call, "simple terms": Generally speaking, git pull is about merging a "remote" branch into a "local" branch. In more detail, git uses the content of the "remote" branch to "update" / "modify" content of the "local" branch. In even more detail, if a file has been modified in the "local" branch but not in the "remote" branch, then after the merge, the content of the file will be the same as the content in the "local" branch. The opposite is also true. If a file was modified on the "remote" branch but not in the "local" branch,

I get this message: Cannot pull with rebase: You have unstaged changes. Please commit or stash them. Yes, I have changes which are not committed. I searched a way to rebase my uncommitted changes on top of the new code which I would get from a pull. I found this: https://github.com/aanand/git-up I want to know if this is still the way to go, or if there are more modern ways to go. I use git version 1.8.1 git-up is probably the more sophisticated way to solve this issue. Otherwise, you need to stash, rebase and stash pop. The "more modern way" will be available in git 1.8.5 (or 1.9, Q4 2013).

When doing a regular git commit, git commit --verbose shows the diff in the text editor when writing the commit message. Suppose I am doing an interactive rebase ( git rebase --interactive ) to edit previous commits. To 'continue' rebasing, I run git rebase --continue . This opens a text editor for editing the commit message, but it does not show the diff. After making changes to a commit, how can I display the diff when (re)writing the commit message during an interactive rebase? git rebase --continue --verbose doesn't seem like a valid command... To show the diff: git -c commit.verbose=true

[This question is essentially reopening git crash during rebase which never had an answer] I'm attempting to a rebase from my 'secc' branch as: $ git rebase main First, rewinding head to replay your work on top of it... fatal: Out of memory, malloc failed (tried to allocate 553656577 bytes) # about 0.5 GB $ git rebase --abort No rebase in progress? The failure is related to the fact that both branches and their common ancestor have three .dat files each of which is 0.5 GB. How can I do a rebase in this situation? Additional info: A 'git merge main' works just fine. Augmenting .gitattributes