git

the stupid content tracker

copy
11
0
cherry pick changes from specific hashgit cherry-pick 6a3ed15cherry pick changes from specific hash, 6a3ed15

1 year ago george 3 |

copy
8
1
delete a branch from gitgit branch -D mybranchDelete a branch

7 months, 2 weeks ago MikeJudge 4 |

copy
4
0
cherry-pick very carefully git cherry-pick -Xpatience topic^Try to apply the change introduced by topic^ again, spending extra time to avoid mistakes based on incorrectly matching context lines

1 year ago george 3 |

copy
3
0
fetch and update multiple branches from remote repositorygit fetch origin +pu:pu maint:tmpThis updates (or creates, as necessary) branches pu and tmp in the local repository by fetching from the branches (respectively) pu and maint from the remote repository. The pu branch will be updated even if it is does not fast-forward, because it is prefixed with a plus sign; tmp will not be.

1 year ago george 3 |

copy
3
0
create a new branchgit branch my2.6.14 v2.6.14Create a new branch

1 year ago george 3 |

copy
3
1
cherry pick changes from full hashgit cherry-pick 5b4254f045afc31349a3502c9a2d4f693498889apull changes from 5b4254f045afc31349a3502c9a2d4f693498889a

1 year ago george 3 |

copy
2
0
git mergetool -t opendiffuse opendiff to merge

2 years, 4 months ago john2 0 | details |

copy
2
0
change an entry in the configgit config core.gitproxy '"ssh" for kernel.org' 'for kernel.org$'The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to "ssh". This makes sure that only the key/value pair for kernel.org is replaced.

1 year ago george 3 |

copy
2
0
replace all core.gitproxy with a new onegit config --replace-all core.gitproxy sshIf you like to live dangerously, you can replace all core.gitproxy by a new one

1 year ago george 3 |

copy
2
0
delete the remote-tracking branches git branch -d -r origin/todo origin/html origin/manDelete the remote-tracking branches "todo", "html" and "man". The next fetch or pull will create them again unless you configure them not to

1 year ago george 3 |

copy
1
0
git mergetool -t diffmergeUse diffmerge to merge

2 years, 4 months ago john2 0 | details |

copy
1
1
commit all modificationsgit commit -am "Committing all modifications"Commit all current modifications to git repo, it's a good habit to run a "git status" before this command to make sure you know what your committing

1 year ago george 3 |

copy
1
1
check the status of the current repogit statusGet the current status of all files that have been modified, added, or not yet committed

1 year ago george 3 |

copy
1
0
change the filemodegit config core.filemode trueyou can set the filemode to true with

1 year ago george 3 |

copy
1
0
create a git archive in tar formatgit archive --format=tar --prefix=git-1.4.0/ v1.4.0 | gzip >git-1.4.0.tar.gzCreate a compressed tarball for v1.4.0 release.

1 year ago george 3 |

copy
0
0
git clone git://git.kernel.org/pub/scm/linux-2.6 my2.6Clone the git repo linux-2.6 on server git.kernel.org in /pub/scm/ to my2.6

2 years, 4 months ago john2 0 | details |

copy
0
0
add multiple text files to git repogit add Documentation/\*.txtAdds content from all \*.txt files under Documentation directory and its subdirectories

1 year ago george 3 |

copy
0
0
add multiple git scripts to repogit add git-*.shConsiders adding content from all git-*.sh scripts. Because this example lets the shell expand the asterisk (i.e. you are listing the files explicitly), it does not consider subdir/git-foo.sh.

1 year ago george 3 |

copy
0
0
Merge two branches into the current onegit merge fixes enhancements Merge branches fixes and enhancements on top of the current branch, making an octopus merge

1 year ago george 3 |

copy
0
0
merge branch into current branch using a merge strategygit merge -s ours obsoleteMerge branch obsolete into the current branch, using ours merge strategy

1 year ago george 3 |