How do i maintain 'topic branch' history of a merge in git?
I am currently creating topic branches:
git checkout -b topic_branch
git checkout master
git merge topic_branch
but currently when I do this, I lose history of my 'topic_branch' and all of the commits just show up.
How do i get the topic branch merge history to show up on my merge?
I've a repo with a master branch I've forked this repo Now I nee to merge updated originale repo into my forked branch. How to ?!
I'm trying to manage our Moodle instance on our own branch of the Moodle repo. I checked out tag v1.9.11 of branch MOODLE_19_STABLE, then copied that to a new branch COE, where I've added in our
I need to merge two Git repositories into a branch new, third repository. I've found many descriptions of how to do this using a subtree merge (for example Jakub Narębski's answer on How do you merge
I'm trying to use git for our software development. I found that if I delete a branch in git, I could lose my code forever. That surprised me. I thought as a version control system, it should be able
My normal git-svn workflow is to do my work on a local branch, then merge to master and git svn dcommit from there to record my commits onto the svn trunk. However, in my current local branch (foo) I'
i want to have no other branch history commit when i merge other branch to master. how can i do it ? as we know: git pull --rebase origin test # mean: only history commit no merge commit. git pull --n
This is the current state of my git repository history: --o--o--o--o--o--o--o master \ o--o--o--o--o topic2 | topic1 I want to rebase topic1 and topic2 onto master, and make it like: --o--o--o--o--o-
After merge all commits into one (for rewrite git log history) on local machine (this operation was succesfull) I have a notice after command git status Your branch and 'origin/master' have diverged,
For a while, I worked in with Git in this unusual way: git checkout -b feature123 tiny edit, commit, repeat git checkout master git merge --squash feature123 Use output of git log --oneline to popula
we cut branch from Trunk. Changes are done on both trees and committed. Now we want to merge branch to trunk with all the revision history from both. Is it possible? Is manual merge is different from
I'm very new to git, I want to know how to track branch history? For example: echo update README in branch master >> README.md git commit -a -mcommit in branch master git checkout -b b1 echo
Company policy is to use --no-ff for merge commits. I personally like to adjust merge log messages so I use --no-commit. Plus I like to actually compile and test before I let the commit go. How do I m
I'm looking to rewrite my git repo to use a new branching model I came across: http://nvie.com/git-model But right now all my history lives in the master branch. I'd like to rewrite it (possible using
I have made a local branch called develop and have made some changes to it. However I now want to merge another developers changes to remotes/devteam/master into my develop local branch. How best do I
After I merge a feature branch back to main branch I usually need to do a merge commit by default. But I'd like to use the original commit messages from my feature branch in this commit instead of me
Suppose I have a main branch and a dev branch. Suppose I merge some stuff from dev into main. I check in the merge Now I decide whoops, the dev branch wasn't really ready for me to merge into main
I'm on branch a. I want to merge branch b into branch c. The merge is not a fast-forward, but it also doesn't require manual resolution. (i.e., it's not the simplest case, but it's also not the most d
How can I maintain the browser history while performing ASP.NET AJAX asynchronous postback operations?
Suppose I merge a branch to the master. Since I do not want to merge everything I run git merge --no-commit, check merged files manually, and decide to exclude some of them from the merge. So, I run g
With our current setup you always have to enter the branch name (ie: git pull origin feature-branch when doing a pull. I've already made the mistake of pulling from one branch into another, accidenta
[~] $ git branch * callgraph master How to suspend a git branch. For instance, the branch master is not up to date, but at this time I want all the team to use the branch callgraph - so working
Here is my situation: A master \ \-- B --- C --- D topic I want to merge topic branch to master but only to commit C without changes introduced in commit D. I know I can create new branch from topic
After running git filter-branch, how do I get a list of old commit SHAs as rewritten by filter-branch to their new corresponding commit SHAs? For example, something similar to: b19fd985746c1f060f761d4
I'm HMS confused I today created a branch to work on implementation of a new feature. I thought this branching was successful as these appeared. However I'd like to merge the new feature branch (NGUI
How do I merge git users? I made several commits using an incorrect user name and now they are shown in the repo history, I would like to merge them with my real name that I'm going to use for the gi
A central git repository we use has two branches that diverged a long time ago. Someone accidentally merged the old branch into the newer one, causing some conflicts. Now I have a merge commit sitting
I want to know if there is a way on the git command line to copy the branch history from a remote repo. In other words, I want to copy the .git/logs directory from the remote to my .git/logs directory
How can I merge one branch in to two other branches? So here's our scenario: We use two branches master for production and UAT for testing purposes. All local development is made on a new branch made
How do I shallow clone a git repository, so that my clone contains only 1 history item, and starts on a specific branch? I know how to do a shallow clone: git clone --depth 1 https://path/to/myrepo.gi
I would like to know if the following is possible in git: Suppose I have the following history: A---B---C---D---E master \ W---X---Y topic I would like to merge all the changes made in the topic bran
I'm working on a git branch that has a lot of merge conflicts with another branch that I've merged into it. I started fixing the conflicts but want to save my work and switch to another branch before
Possible Duplicate: How do I merge a specific commit from one branch into another in Git? I'm newby to git. Got a question: If I want a single commit from one branch onto another branch, what comman
Possible Duplicate: Is it possible to move/rename files in git and maintain their history? I am a previous subversion user, not sure how git could help me in following situation. I have a git reposi
I'm trying to find the syntax for merging a tagged commit onto another branch. I'm guessing that it's straight forward but my feeble search attempts aren't finding it.
After I solved all merge conflicts of important files, I want to merge regardless of all left conflict files. Git should just keep the files from the branch I want to merge in (--ours). How can I do t
If you want to keep track of the moment you started a new feature-branch you can use git merge --no-ff -m merged feature-branch some-feature-branch As described here. How can I achieve this using
OK so: In svn and bzr, I can branch, commit, merge, and my commit history will look like this: 41: Theodore R. Smith 2013-09-14 Jump to list by name instead of number. 40: Theodore R. Smith 2013-09-14
I have a local develop branch dev and a remote master branch. For the dev branch, I have a quite complicated commit history(nearly 20 successive commits). I tried to use git rebase -i origin/m
This is my current git-svn workflow: git checkout -b feature master # hack commit hack commit git checkout master git svn rebase git merge feature git svn dcommit This usually works fine, git replays
This question already has an answer here: Git: How to edit/reword a merge commit's message? 3 answers I have merged with other branch, and there are few commits after merge, before pushing i wa
In our repository we develop features based on feature branches. Lately I integrated a feature feature/myfeature into master: git merge --no-ff feature/myfeature After this merge some more developmen
I have two local git branches on my machine - a branch called v2 and a branch called master. I'm merging v2 into master while master is checked out and the head branch. I'd like to merge the v2
I have two branches. One is master, and the other one i myBranch and they look something like this: master | | myBranch | / | / |/ | I want to merge them into one branch, keeping all the changes from
in my master branch somehow was merged another branch that should not be merged there. Are there a git command(s) that can tell me who did the merge and when the merge was done? I don't have the merg
I want to have a /doc folder in master and easily merge/sync it to the root of a gh-pages branch. What is the easiest way to do this?
I know a git repository where their authors are committing changes in the same branch as the upstream repository and they merge with upstream sometimes. How may I know what patches are exclusive of a
Is there a way to have git always merge without a fast-forward, except for when pulling? Following a nice git-flow, I like keeping my branch history (easier to remove features, etc later on), so I hav
I have the following situation: I made some commits to my local repository, and then a huge merge of another branch (~150 commits) into the master - it had a lot of conflicts in it. Now, I want to mov
I used git branch -d myBranch to delete a branch. However, when I am on master and try to checkout a new branch with git checkout, myBranch still appears in the tab-autocomplete. How do I remove the n
We recently moved from SVN to Git, but there's a single legacy branch that I need to bring in to the Git repository. The SVN and Git repositories are the same logical code (i.e. they're both called fo