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…
git-maintenance – Run tasks to optimize Git repository data Synopsisgit maintenance run [<options>]DescriptionRun 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. These commands do not…
git-mailsplit – Simple UNIX mbox splitter program Synopsisgit mailsplit [-b] [-f<nn>] [-d<prec>] [–keep-cr] [–mboxrd] -o<directory> [–] [(<mbox>|<Maildir>)…]DescriptionSplits 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 patches in…
git-mailinfo – Extracts patch and authorship from a single e-mail message Synopsisgit mailinfo [-k|-b] [-u | –encoding=<encoding> | -n] [–[no-]scissors] [–quoted-cr=<action>] <msg> <patch>DescriptionReads a single e-mail message from the standard input, and writes the commit log message in <msg> file, and the patches in <patch> file. The author name, e-mail and e-mail subject are written…
git-ls-tree – List the contents of a tree object Synopsisgit ls-tree [-d] [-r] [-t] [-l] [-z] [–name-only] [–name-status] [–full-name] [–full-tree] [–abbrev[=<n>]] <tree-ish> [<path>…]DescriptionLists 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 of "/bin/ls" in that the…
git-ls-remote – List references in a remote repository Synopsisgit ls-remote [–heads] [–tags] [–refs] [–upload-pack=<exec>] [-q | –quiet] [–exit-code] [–get-url] [–sort=<key>] [–symref] [<repository> [<refs>…]]DescriptionDisplays 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 options are not mutually exclusive; when given both,…
git-ls-files – Show information about files in the index and the working tree Synopsisgit 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=<pattern>] [-X <file>|–exclude-from=<file>] [–exclude-per-directory=<file>] [–exclude-standard] [–error-unmatch] [–with-tree=<tree-ish>] [–full-name] [–recurse-submodules] [–abbrev[=<n>]] [–] [<file>…]DescriptionThis merges the file listing in the index with the actual working directory list, and shows different combinations of the…
git-lost-found – Recover lost refs that luckily have not yet been pruned Synopsisgit lost-foundDescriptionNOTE: this command is deprecated. Use git-fsck(1) with the option –lost-found instead. Finds dangling commits and tags from the object database, and creates refs to them in the .git/lost-found/ directory. Commits and tags that dereference to commits are stored in .git/lost-found/commit, and…
git-log – Show commit logs Synopsisgit log [<options>] [<revision range>] [[–] <path>…]DescriptionShows the commit logs. List commits that are reachable by following the parent links from the given commit(s), but exclude commits that are reachable from the one(s) given with a ^ in front of them. The output is given in reverse chronological order by…
git-locked – ls files that have been locked Synopsisgit-locked DescriptionList local files that have been locked Examples$ git lock config/database.yml $ git locked config/database.ymlAuthorWritten by Kevin Woo <kevinawoo [at] gmail.com> Reporting Bugs<https://github.com/tj/git-extras/issues> See Also<https://github.com/tj/git-extras>
git-lock – Lock a file excluded from version control Synopsisgit-lock <filename> DescriptionLock local files from version control. Options<filename> The name of the filename. Examples$ git lock config/database.ymlAuthorWritten by Julio Napuri <julionc [at] gmail.com> Reporting Bugs<https://github.com/tj/git-extras/issues> See Also<https://github.com/tj/git-extras>
git-local-commits – List local commits Synopsisgit-local-commits <args> DescriptionLists commits in the local branch that have not been pushed to origin. Options<args> All arguments passed to git-local-commits will be passed directly to git-log. Examples$ git local-commits –graphAuthorWritten by Michael Komitee <mkomitee [at] gmail.com> Reporting Bugs<https://github.com/tj/git-extras/issues> See Also<https://github.com/tj/git-extras>
git-line-summary – Show repository summary by line Synopsisgit-line-summary DescriptionShow a summary by line of the repository, rather than by commit like git-summary. ExamplesOutputs a repo summary by line. $ git line-summary project : git-extras lines : 16004 authors : 7757 hemanth.hm 48.5% 1019 spacewander 6.4% 916 CJ 5.7% 768 Jonhnny Weslley 4.8% 711 Mark Eissler…
git-latexdiff – Call latexdiff on two Git revisions of a file OptionsUsage: git latexdiff [options] OLD [NEW] git latexdiff [options] OLD — git latexdiff [options] — OLD Call latexdiff on two Git revisions of a file. OLD and NEW are Git revision identifiers. NEW defaults to HEAD. If "–" is used for NEW, then diff…
git-interpret-trailers – Add or parse structured information in commit messages Synopsisgit interpret-trailers [<options>] [(–trailer <token>[(=|:)<value>])…] [<file>…] git interpret-trailers [<options>] [–parse] [<file>…]DescriptionHelp parsing or adding trailers lines, that look similar to RFC 822 e-mail headers, at the end of the otherwise free-form part of a commit message. This command reads some patches or commit messages from…