NAME git-mktree – Build a tree-object from ls-tree formatted text SYNOPSIS git mktree[-z][–missing][–batch] DESCRIPTION Reads 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…
NAME git-mktag – Creates a tag object with extra validation SYNOPSIS git mktag DESCRIPTION Reads 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…
NAME git-missing – Show commits missing from another branch SYNOPSIS git-missing [<first branch>] <second branch> [<git log options>] DESCRIPTION Shows 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…
NAME git-mergetool – Run merge conflict resolution tools to resolve merge conflicts SYNOPSIS git mergetool[–tool = <tool>][-y | –[no – ] prompt][<file>…] DESCRIPTION Use 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…
git-mergetool–lib – Common Git merge tool shell scriptlets Synopsis TOOL_MODE=(diff|merge) . "$(git –exec-path)/git-mergetool–lib" Description This 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…
NAME git-merge – Join two or more development histories together SYNOPSIS git 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) DESCRIPTION Incorporates changes from the named commits (since the time their histories…
NAME git-merge-tree – Show three-way merge without touching index SYNOPSIS git merge-tree <base-tree> <branch1> <branch2> DESCRIPTION Reads 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…
NAME git-merge-repo – Merge two repo histories SYNOPSIS git-merge-repo <repo> <branch> <directory> [–squash] DESCRIPTION Merges 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. EXAMPLES Merges a local repo’s frontend branch into the current repo’s web folder: $…
NAME git-merge-one-file – The standard helper program to use with git-merge-index SYNOPSIS git merge-one-file DESCRIPTION This 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. GIT Part of the git(1) suite Index
NAME git-merge-into – Merge one branch into another SYNOPSIS git merge-into [src] <dest> [–ff-only] DESCRIPTION Merge 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…
NAME git-merge-index – Run a merge for files needing merging SYNOPSIS git merge – index[-o][-q]<merge – program>(-a | [–]<file> *) DESCRIPTION This 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>…
NAME git-merge-file – Run a three-way file merge SYNOPSIS git 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> DESCRIPTION git merge-file incorporates all changes that lead from the <base-file> to <other-file>…
NAME git-merge-changelog – manual page for git-merge-changelog /builddir/build/BUILDROOT/gnulib-0-14.20150325git.el7.x86_64/usr/bin/git-merge-changelog SYNOPSIS git-merge-changelog [OPTION] O-FILE-NAME A-FILE-NAME B-FILE-NAME DESCRIPTION Merges 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…
NAME git-merge-base – Find as good common ancestors as possible for a merge SYNOPSIS git 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>] DESCRIPTION git merge-base finds best common ancestor(s) between two…
NAME git-maintenance – Run tasks to optimize Git repository data SYNOPSIS git maintenance run [<options>] DESCRIPTION Run tasks to optimize Git repository data, speeding up other Git commands and reducing storage requirements for the repository. Git commands that add repository data, such as git add or git fetch, are optimized for a responsive user experience….
NAME git-mailsplit – Simple UNIX mbox splitter program SYNOPSIS git mailsplit[-b][-f<nn>][-d<prec>][–keep – cr][–mboxrd] – o<directory>[–][(<mbox> | <Maildir>)…] DESCRIPTION Splits a mbox file or a Maildir into a list of files: "0001" "0002" .. in the specified directory so you can process them further from there. Important Maildir splitting relies upon filenames being sorted to output…
NAME git-mailinfo – Extracts patch and authorship from a single e-mail message SYNOPSIS git mailinfo[-k | -b][-u | –encoding = <encoding> | -n] [–[no – ] scissors][–quoted – cr = <action>]<msg><patch> DESCRIPTION Reads a single e-mail message from the standard input, and writes the commit log message in <msg> file, and the patches in <patch>…
NAME git-ls-tree – List the contents of a tree object SYNOPSIS git ls – tree[-d][-r][-t][-l][-z] [–name – only][–name – status][–full – name][–full – tree][–abbrev[=<n>]]<tree – ish>[<path>…] DESCRIPTION Lists the contents of a given tree object, like what "/bin/ls -a" does in the current working directory. Note that: • the behaviour is slightly different from that…
NAME git-ls-remote – List references in a remote repository SYNOPSIS git ls – remote[–heads][–tags][–refs][–upload – pack = <exec>] [-q | –quiet][–exit – code][–get – url][–sort = <key>] [–symref][<repository>[<refs>…]] DESCRIPTION Displays references available in a remote repository along with the associated commit IDs. OPTIONS -h, –heads, -t, –tags Limit to only refs/heads and refs/tags, respectively. These…
NAME git-ls-files – Show information about files in the index and the working tree SYNOPSIS git ls – files[-z][-t][-v][-f](–[cached | deleted | others | ignored | stage | unmerged | killed | modified]) * (-[c | d | o | i | s | u | k | m]) * [–eol] [–deduplicate] [-x<pattern> | –exclude…