FarNet.GitKit 0.7.3

FarNet.GitKit

Far Manager git helpers based on LibGit2Sharp

• About
• Install
• Commands
  • Init command
  • Clone command
  • Commit command
  • Checkout command
  • Pull command
  • Push command
• Panels
  • Branches panel
  • Commits panel
  • Changes panel
• Menu
• Settings
• Credentials

About

Contents

GitKit is the FarNet module for git operations in Far Manager. GitKit uses LibGit2Sharp and git is not needed as such. Git may be optionally used for getting credentials.

Project FarNet

• Wiki: https://github.com/nightroman/FarNet/wiki
• Site: https://github.com/nightroman/FarNet
• Author: Roman Kuzmin

Install

Contents

• Far Manager
• Package FarNet
• Package FarNet.GitKit
• Optional package FarNet.PowerShellFar

How to install and update FarNet and modules
https://github.com/nightroman/FarNet#readme

Commands

Contents

GitKit commands use the prefix gk. Commands may be typed and invoked in the Far Manager command line or using F11 / FarNet / Invoke. Commands may be also defined in the Far Manager user menu and file associations.

The command gk: without subcommand prints the repository status. Some commands require parameters, one or more key=value pairs separated by semicolons, using the connection string format.

gk:subcommand [key=value] [; key=value] ...

Common parameters

• Repo=<path>

  Specifies the existing repository path. Default: the current panel directory.

Panel commands

• gk:branches

  Opens the Branches panel.

• gk:commits

  Opens the Commits panel.

• gk:changes

  Opens the Changes panel.

Operation commands

• gk:init

  Creates repository, see Init command.

• gk:clone

  Clones repository, see Clone command.

• gk:commit

  Commits changes, see Commit command.

• gk:checkout

  Checkouts branch, see Checkout command.

• gk:pull

  Pulls the head branch, see Pull command.

• gk:push

  Pushes the head branch, see Push command.

• gk:

  Prints the repository status: summary of changes if any, the commit hash, local and remote branches with the same tip commit, the commit message.

Init command

Contents

Use this command in order to create a repository

gk:init

Parameters

• Path=<string>

  Specifies the new repository directory. Default: the current panel directory.

• IsBare={true|false}

  Tells to create a bare repository.

Clone command

Contents

Use this command in order to clone a repository

gk:clone

Parameters

• Url=<string> (required)

  Specifies the source repository URL.

• Path=<string>

  Specifies the local path to clone into. Default: the current panel directory.

• IsBare={true|false}

  Tells to clone a bare repository.

• NoCheckout={true|false}

  Tells not to checkout after cloning.

• RecurseSubmodules={true|false}

  Tells to recursively clone submodules.

Commit command

Contents

Use this command in order to commit changes

gk:commit

Parameters

• Message=<string>

  The commit message. Omit it in order to compose in the editor. If you also set CommentaryChar then the editor text will contain commentaries about changes.

• All={true|false}

  Tells to stage all changes before committing.

• AllowEmptyCommit={true|false}

  Tells to allow creation of an empty commit.

• AmendPreviousCommit={true|false}

  Tells to amend the previous commit.

• PrettifyMessage={true|false}

  Tells to prettify the message by stripping leading and trailing empty lines, trailing spaces, and collapsing consecutive empty lines. PrettifyMessage is ignored if CommentaryChar is set.

• CommentaryChar=<char>

  The starting line char used to identify commentaries in the commit message. If set (usually to "#"), all lines starting with this char will be removed. CommentaryChar implies PrettifyMessage=true.

Examples

# commit all changes, compose a new message in the editor
gk:commit All=true; CommentaryChar=#

# amend with all changes, modify the old message in the editor
gk:commit All=true; CommentaryChar=#; AmendPreviousCommit=true

Checkout command

Contents

Use this command in order to checkout the specified branch

gk:checkout

Parameters

• Branch=<string>

  The branch to checkout. If it is omitted you are prompted to input the branch name.

  If the specified branch does not exists, it is created from the head branch, with a confirmation dialog.

Pull command

Contents

Use this command in order to pull the head branch

gk:pull

Push command

Contents

Use this command in order to push the head branch, with a confirmation dialog

gk:push

Panels

Contents

GitKit provides several panels for browsing and operating

• Branches panel
• Commits panel
• Changes panel

Common panel keys and actions

• CtrlA

  Opens the cursor item property panel. This operation requires FarNet.PowerShellFar.

Branches panel

Contents

This panel shows the repository branches, local and remote. Branch marks: * head, r remote, = tracked same as remote, < tracked older, > tracked newer.

The panel is opened by

gk:branches

Keys and actions

• Enter

  Opens the cursor branch Commits panel.

• ShiftEnter

  Checkouts the cursor branch. For the local branch, makes it the head branch. For the remote branch, creates a new branch from it and makes it the head branch.

• ShiftF5

  Creates a new branch from the cursor branch.

• ShiftF6

  Renames the cursor branch.

• F7

  Creates and checkouts a new branch from the head branch. Note that the head branch is with *, not the cursor. To copy the cursor branch, use ShiftF5.

• F8, Del

  Safely deletes the selected local branches.

  Branches with unique local commits and remote branches are not deleted. Use ShiftF8, ShiftDel in order to force delete them.

• ShiftF8, ShiftDel

  Forcedly deletes the selected local and remote branches.

• Other keys

  See Panels for common keys and actions.

• Other actions

  See Menu.

Commits panel

Contents

This panel shows branch commits. Commits are shown by pages of CommitsPageLimit, see Settings.

The panel is opened from the branches panel or for the head branch by

gk:commits

Keys and actions

• Enter

  Opens the cursor commit Changes panel.

• PgDn

  At the last shown commit, loads the next page commits.

• PgUp

  At the first shown commit, loads the previous page commits.

• Other keys

  See Panels for common keys and actions.

• Other actions

  See Menu.

Changes panel

Contents

This panel shows changed files.

The panel is opened from the commits panel or by the menu commands "Compare branches" and "Compare commits" or for the current changes by

gk:changes

Keys and actions

• Enter

  Opens the diff tool specified by the setting DiffTool.

• F3, F4

  Opens the diff patch in the viewer or editor.

• Other keys

  See Panels for common keys and actions.

Menu

Contents

• Push branch (branches panel, commits panel)

  Branches panel: Pushes the cursor branch, with a confirmation dialog.

  Commits panel: Pushes the commits branch, with a confirmation dialog.

• Merge branch (branches panel)

  Merges the cursor branch into the head branch, with a confirmation dialog.

• Compare branches (branches panel)

  Compares the cursor branch with the selected branch and opens the changes panel. If nothing is selected then the head branch is used.

• Create branch (commits panel)

  Creates a new branch from the cursor commit.

• Compare commits (commits panel)

  Compares the cursor commit with the selected commit and opens the changes panel. If nothing is selected then the tip commit is used.

• Help

  Shows GitKit help.

Settings

Contents

The module settings: F11 / FarNet / Settings / GitKit.

DiffTool and DiffToolArguments

Specify the diff tool and its arguments used to compare changed files. In arguments use %1 and %2 as file path substitutes. Environment variables are expanded.

VSCode is used as the default diff tool

%LOCALAPPDATA%\Programs\Microsoft VS Code\bin\code.cmd
--wait --diff "%1" "%2"

UseGitCredentials

If true, tells to use git credentials for remote tasks. See Credentials for details. Default: false.

CommitsPageLimit

Maximum number of commits per panel pages. Default: 100.

ShaPrefixLength

The number of chars for truncated commit SHA. Default: 7.

Credentials

Contents

Remote git operations require credentials, git host user name and password. GitKit offers two ways, with some advantages and disadvantages.

By default, see Settings, with UseGitCredentials set to false, the input dialog is used. For the given git host, enter the user name and password and optionally save them for later use. The environment variable GitKit_User is used for keeping credentials.

Alternatively, if you have git installed and available in the path, set UseGitCredentials to true in order to use git for getting credentials.