git-p4 – Import from and submit to Perforce repositories Synopsisgit p4 clone [<sync options>] [<clone options>] <p4 depot path>… git p4 sync [<sync options>] [<p4 depot path>…] git p4 rebase git p4 submit [<submit options>] [<master branch name>]DescriptionThis command provides a way to interact with p4 repositories using Git. Create a new Git repository from…
git-obliterate – rewrite past commits to remove some files Synopsisgit obliterate <files…> [– <rev-list options…>] DescriptionCompletely remove some files from the repository, including past commits and tags. WARNING! This command will rewirte the history similar to git rebase(though it affects more). The rewritten history will have different object names for all the objects and will…
git-notes – Add or inspect object notes Synopsisgit notes [list [<object>]] git notes add [-f] [–allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>] git notes copy [-f] ( –stdin | <from-object> [<to-object>] ) git notes append [–allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>] git notes edit…
git-name-rev – Find symbolic names for given revs Synopsisgit name-rev [–tags] [–refs=<pattern>] ( –all | –stdin | <commit-ish>… )DescriptionFinds symbolic names suitable for human digestion for revisions given in any format parsable by git rev-parse. Options–tags Do not use branch names, but only tags to name the commits –refs=<pattern> Only use refs whose names match…
git-mv – Move or rename a file, a directory, or a symlink Synopsisgit mv <options>… <args>…DescriptionMove or rename a file, directory or symlink. git mv [-v] [-f] [-n] [-k] <source> <destination> git mv [-v] [-f] [-n] [-k] <source> … <destination directory> In the first form, it renames <source>, which must exist and be either a…
git-multi-pack-index – Write and verify multi-pack-indexes Synopsisgit multi-pack-index [–object-dir=<dir>] [–[no-]bitmap] <sub-command>DescriptionWrite or verify a multi-pack-index (MIDX) file. Options–object-dir=<dir> Use given directory for the location of Git objects. We check <dir>/packs/multi-pack-index for the current MIDX file, and <dir>/packs for the pack-files to index. <dir> must be an alternate of the current repository. –[no-]progress Turn progress on/off…
git-mktree – Build a tree-object from ls-tree formatted text Synopsisgit mktree [-z] [–missing] [–batch]DescriptionReads standard input in non-recursive ls-tree output format, and creates a tree object. The order of the tree entries is normalized by mktree so pre-sorting the input is not required. The object name of the tree object built is written to the…
git-mktag – Creates a tag object with extra validation Synopsisgit mktagDescriptionReads a tag contents on standard input and creates a tag object. The output is the new tag’s <object> identifier. This command is mostly equivalent to git-hash-object(1) invoked with -t tag -w –stdin. I.e. both of these will create and write a tag found in…
git-missing – Show commits missing from another branch Synopsisgit-missing [<first branch>] <second branch> [<git log options>] DescriptionShows commits that are in either of two branches but not both. Useful for seeing what would come across in a merge or push. Options[<first branch>] First branch to compare. If not specified, defaults to currently checked out branch….
git-mergetool – Run merge conflict resolution tools to resolve merge conflicts Synopsisgit mergetool [–tool=<tool>] [-y | –[no-]prompt] [<file>…]DescriptionUse git mergetool to run one of several merge utilities to resolve merge conflicts. It is typically run after git merge. If one or more <file> parameters are given, the merge tool program will be run to resolve…
git-mergetool–lib – Common Git merge tool shell scriptlets SynopsisTOOL_MODE=(diff|merge) . "$(git –exec-path)/git-mergetool–lib"DescriptionThis is not a command the end user would want to run. Ever. This documentation is meant for people who are studying the Porcelain-ish scripts and/or are writing new ones. The git-mergetool–lib scriptlet is designed to be sourced (using .) by other shell scripts…
git-merge – Join two or more development histories together Synopsisgit merge [-n] [–stat] [–no-commit] [–squash] [–[no-]edit] [–no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]] [–[no-]allow-unrelated-histories] [–[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>…] git merge (–continue | –abort | –quit)DescriptionIncorporates changes from the named commits (since the time their histories diverged from the current branch) into the current branch….
git-merge-tree – Show three-way merge without touching index Synopsisgit merge-tree <base-tree> <branch1> <branch2>DescriptionReads three tree-ish, and output trivial merge results and conflicting stages to the standard output. This is similar to what three-way git read-tree -m does, but instead of storing the results in the index, the command outputs the entries to the standard output….
git-merge-repo – Merge two repo histories Synopsisgit-merge-repo <repo> <branch> <directory> [–squash] DescriptionMerges a repository’s history with the current repository, inside a specified directory. Optional –squash flag skips the full history and generates only one commit for the merge. ExamplesMerges a local repo’s frontend branch into the current repo’s web folder: $ git merge-repo ../app/.git frontend…
git-merge-one-file – The standard helper program to use with git-merge-index Synopsisgit merge-one-fileDescriptionThis is the standard helper program to use with git merge-index to resolve a merge after the trivial merge done with git read-tree -m. GitPart of the git(1) suite
git-merge-into – Merge one branch into another Synopsisgit merge-into [src] <dest> [–ff-only] DescriptionMerge one branch into another, and keep yourself on current branch. If src branch not given, it will merge current one to dest. Options<src> The name of the branch will be merged into. If this not given, use current branch as default. <dest>…
git-merge-index – Run a merge for files needing merging Synopsisgit merge-index [-o] [-q] <merge-program> (-a | [–] <file>*)DescriptionThis looks up the <file>(s) in the index and, if there are any merge entries, passes the SHA-1 hash for those files as arguments 1, 2, 3 (empty argument if no file), and <file> as argument 4. File…
git-merge-file – Run a three-way file merge Synopsisgit merge-file [-L <current-name> [-L <base-name> [-L <other-name>]]] [–ours|–theirs|–union] [-p|–stdout] [-q|–quiet] [–marker-size=<n>] [–[no-]diff3] <current-file> <base-file> <other-file>Descriptiongit merge-file incorporates all changes that lead from the <base-file> to <other-file> into <current-file>. The result ordinarily goes into <current-file>. git merge-file is useful for combining separate changes to an original. Suppose <base-file>…
git-merge-changelog – manual page for git-merge-changelog /builddir/build/BUILDROOT/gnulib-0-14.20150325git.el7.x86_64/usr/bin/git-merge-changelog Synopsisgit-merge-changelog [OPTION] O-FILE-NAME A-FILE-NAME B-FILE-NAME DescriptionMerges independent modifications of a ChangeLog style file. O-FILE-NAME names the original file, the ancestor of the two others. A-FILE-NAME names the publicly modified file. B-FILE-NAME names the user-modified file. Writes the merged file into A-FILE-NAME. Informative output:-h, –help display this help and…
git-merge-base – Find as good common ancestors as possible for a merge Synopsisgit merge-base [-a|–all] <commit> <commit>… git merge-base [-a|–all] –octopus <commit>… git merge-base –is-ancestor <commit> <commit> git merge-base –independent <commit>… git merge-base –fork-point <ref> [<commit>]Descriptiongit merge-base finds best common ancestor(s) between two commits to use in a three-way merge. One common ancestor is better…