Go to file
Nguyễn Thái Ngọc Duy 1235875594 help: move git-diff and git-reset to different groups
The third column in command-list.txt determines what group a common
command is printed in 'git help'.

"git reset" is currently in the "work on the current change (see also:
git help everyday)" group. While it's true that "git reset" can
manipulate the index and can be in this group, its unique
functionality is resetting HEAD, which should be the "grow, mark,
tweak history" group.

Moving it there will also avoid the confusion because both 'restore'
and 'reset' are in the same group, next to each other.

While looking at the 'group, mark, tweak history', I realize "git
diff" should not be there. All the commands in this group is about
_changing_ the commit history while "git diff" is a read-only
operation. It fits better in the "examine the history and state" group
(especially when "git status", its close friend, is already there).

This is what we have after the reorganization:

    work on the current change (see also: git help everyday)
       add       Add file contents to the index
       mv        Move or rename a file, a directory, or a symlink
       restore   Restore working tree files
       rm        Remove files from the working tree and from the index

    examine the history and state (see also: git help revisions)
       bisect    Use binary search to find the commit that introduced a bug
       diff      Show changes between commits, commit and working tree, etc
       grep      Print lines matching a pattern
       log       Show commit logs
       show      Show various types of objects
       status    Show the working tree status

    grow, mark and tweak your common history
       branch    List, create, or delete branches
       commit    Record changes to the repository
       merge     Join two or more development histories together
       rebase    Reapply commits on top of another base tip
       reset     Reset current HEAD to the specified state
       switch    Switch branches
       tag       Create, list, delete or verify a tag object signed with GPG

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-05-07 13:04:48 +09:00
.github
Documentation doc: promote "git restore" 2019-05-07 13:04:48 +09:00
block-sha1
builtin doc: promote "git restore" 2019-05-07 13:04:48 +09:00
ci travis: remove the hack to build the Windows job on Azure Pipelines 2019-03-01 08:21:26 +09:00
compat Merge branch 'jk/guard-bswap-header' 2019-03-11 16:16:25 +09:00
contrib completion: support restore 2019-05-07 13:04:48 +09:00
ewah
git-gui
gitk-git
gitweb
mergetools
negotiator
perl
po l10n: Fixes to Catalan translation 2019-03-02 19:12:58 +01:00
ppc
refs files-backend: drop refs parameter from split_symref_update() 2019-02-14 15:26:15 -08:00
sha1collisiondetection@232357eb2e
sha1dc
sha256
t doc: promote "git restore" 2019-05-07 13:04:48 +09:00
templates
trace2 trace2: create new combined trace facility 2019-02-22 15:27:59 -08:00
vcs-svn
xdiff
.clang-format trace2: add for_each macros to clang-format 2019-02-22 15:28:22 -08:00
.editorconfig
.gitattributes
.gitignore checkout: split part of it to new command 'restore' 2019-05-07 13:04:47 +09:00
.gitmodules
.mailmap .mailmap: map Clemens Buchacher's mail addresses 2019-02-08 11:14:15 -08:00
.travis.yml travis: remove the hack to build the Windows job on Azure Pipelines 2019-03-01 08:21:26 +09:00
.tsan-suppressions
COPYING
GIT-VERSION-GEN Start 2.22 cycle 2019-03-07 11:59:54 +09:00
INSTALL
LGPL-2.1
Makefile checkout: split part of it to new command 'restore' 2019-05-07 13:04:47 +09:00
README.md README: adjust for final Azure Pipeline ID 2019-02-23 21:27:04 -08:00
RelNotes Start 2.22 cycle 2019-03-07 11:59:54 +09:00
abspath.c
aclocal.m4
advice.c doc: promote "git switch" 2019-04-02 13:57:00 +09:00
advice.h
alias.c
alias.h
alloc.c
alloc.h
apply.c completion: add more parameter value completion 2019-02-20 12:31:56 -08:00
apply.h
archive-tar.c
archive-zip.c
archive.c
archive.h
argv-array.c
argv-array.h
attr.c Merge branch 'rd/attr.c-comment-typofix' 2019-03-11 16:16:24 +09:00
attr.h
azure-pipelines.yml
banned.h
base85.c
bisect.c Merge branch 'ds/push-sparse-tree-walk' 2019-02-06 22:05:25 -08:00
bisect.h
blame.c Merge branch 'wh/author-committer-ident-config' 2019-03-07 09:59:53 +09:00
blame.h
blob.c
blob.h
branch.c checkout: inform the user when removing branch state 2019-04-02 13:56:59 +09:00
branch.h checkout: inform the user when removing branch state 2019-04-02 13:56:59 +09:00
builtin.h checkout: split part of it to new command 'restore' 2019-05-07 13:04:47 +09:00
bulk-checkin.c
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c Merge branch 'jk/loose-object-cache-oid' 2019-02-06 22:05:27 -08:00
cache-tree.h
cache.h Merge branch 'jh/trace2' 2019-03-07 09:59:56 +09:00
chdir-notify.c
chdir-notify.h
check-builtins.sh
check_bindir
checkout.c
checkout.h
color.c
color.h
column.c
column.h
combine-diff.c Merge branch 'en/combined-all-paths' 2019-03-07 09:59:54 +09:00
command-list.txt help: move git-diff and git-reset to different groups 2019-05-07 13:04:48 +09:00
commit-graph.c
commit-graph.h
commit-reach.c
commit-reach.h
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c
commit.h
common-main.c trace2: collect Windows-specific process information 2019-02-22 15:27:59 -08:00
config.c Merge branch 'jh/trace2' 2019-03-07 09:59:56 +09:00
config.h
config.mak.dev
config.mak.in
config.mak.uname Sync with maint 2019-03-11 16:16:34 +09:00
configure.ac
connect.c trace2:data: add trace2 transport child classification 2019-02-22 15:28:14 -08:00
connect.h
connected.c
connected.h
convert.c Merge branch 'jk/unused-parameter-cleanup' 2019-02-06 22:05:23 -08:00
convert.h
copy.c
credential-cache--daemon.c
credential-cache.c
credential-store.c
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c completion: add more parameter value completion 2019-02-20 12:31:56 -08:00
decorate.c
decorate.h
delta-islands.c
delta-islands.h
delta.h
detect-compiler
diff-delta.c
diff-lib.c diff: drop options parameter from diffcore_fix_diff_index() 2019-02-14 15:26:14 -08:00
diff-no-index.c diff: reuse diff setup for --no-index case 2019-02-24 07:08:34 -08:00
diff.c Merge branch 'nd/diff-parseopt-2' 2019-03-07 09:59:58 +09:00
diff.h Merge branch 'jk/diff-no-index-initialize' 2019-03-07 09:59:59 +09:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir-iterator.c
dir-iterator.h
dir.c Merge branch 'nd/the-index-final' 2019-02-06 22:05:23 -08:00
dir.h
editor.c trace2:data: add editor/pager child classification 2019-02-22 15:27:59 -08:00
entry.c Merge branch 'tg/checkout-no-overlay' 2019-03-07 09:59:51 +09:00
environment.c
exec-cmd.c trace2: create new combined trace facility 2019-02-22 15:27:59 -08:00
exec-cmd.h
fast-import.c
fetch-negotiator.c
fetch-negotiator.h
fetch-object.c
fetch-object.h
fetch-pack.c Merge branch 'bc/fetch-pack-clear-alternate-shallow' 2019-02-06 22:05:30 -08:00
fetch-pack.h
fmt-merge-msg.h
fsck.c
fsck.h
fsmonitor.c
fsmonitor.h
fuzz-commit-graph.c fuzz-commit-graph: initialize repo object 2019-02-07 13:02:26 -08:00
fuzz-pack-headers.c
fuzz-pack-idx.c
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl restore: support --patch 2019-05-07 13:04:47 +09:00
git-archimport.perl
git-bisect.sh
git-compat-util.h trace2: create new combined trace facility 2019-02-22 15:27:59 -08:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-filter-branch.sh
git-instaweb.sh
git-legacy-rebase.sh Merge branch 'js/rebase-i-redo-exec-fix' 2019-02-08 20:44:52 -08:00
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-p4.py
git-parse-remote.sh
git-quiltimport.sh
git-rebase--am.sh
git-rebase--common.sh Merge branch 'en/rebase-merge-on-sequencer' 2019-02-06 22:05:20 -08:00
git-rebase--preserve-merges.sh
git-remote-testgit.sh
git-request-pull.sh
git-send-email.perl completion: add more parameter value completion 2019-02-20 12:31:56 -08:00
git-sh-i18n.sh
git-sh-setup.sh
git-stash.sh
git-submodule.sh submodule: document default behavior 2019-02-15 09:55:27 -08:00
git-svn.perl
git-web--browse.sh
git.c checkout: split part of it to new command 'restore' 2019-05-07 13:04:47 +09:00
git.rc
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c
grep.h
hash.h
hashmap.c
hashmap.h
help.c
help.h
hex.c
http-backend.c
http-fetch.c
http-push.c Merge branch 'jk/loose-object-cache-oid' 2019-02-06 22:05:27 -08:00
http-walker.c
http.c Merge branch 'jk/loose-object-cache-oid' 2019-02-06 22:05:27 -08:00
http.h Merge branch 'jk/loose-object-cache-oid' 2019-02-06 22:05:27 -08:00
ident.c
imap-send.c Merge branch 'nd/imap-send-typofix' 2019-02-12 09:00:25 -08:00
interdiff.c
interdiff.h
iterator.h
json-writer.c
json-writer.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
line-log.c
line-log.h
line-range.c
line-range.h
linear-assignment.c
linear-assignment.h
list-objects-filter-options.c completion: add more parameter value completion 2019-02-20 12:31:56 -08:00
list-objects-filter-options.h
list-objects-filter.c
list-objects-filter.h
list-objects.c Merge branch 'ds/push-sparse-tree-walk' 2019-02-06 22:05:25 -08:00
list-objects.h
list.h
ll-merge.c
ll-merge.h
lockfile.c
lockfile.h
log-tree.c Merge branch 'wh/author-committer-ident-config' 2019-03-07 09:59:53 +09:00
log-tree.h
ls-refs.c
ls-refs.h
mailinfo.c
mailinfo.h
mailmap.c
mailmap.h
match-trees.c Merge branch 'jk/unused-parameter-cleanup' 2019-02-06 22:05:23 -08:00
mem-pool.c
mem-pool.h
merge-blobs.c
merge-blobs.h
merge-recursive.c Merge branch 'nd/completion-more-parameters' 2019-03-07 09:59:58 +09:00
merge-recursive.h
merge.c
mergesort.c
mergesort.h
midx.c
midx.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c
notes-merge.h
notes-utils.c
notes-utils.h
notes.c
notes.h
object-store.h Merge branch 'jk/loose-object-cache-oid' 2019-02-06 22:05:27 -08:00
object.c object: fix leak of shallow_stat 2019-02-07 13:02:28 -08:00
object.h
oidmap.c
oidmap.h
oidset.c
oidset.h
pack-bitmap-write.c
pack-bitmap.c
pack-bitmap.h
pack-check.c
pack-objects.c pack-objects: drop unused parameter from oe_map_new_pack() 2019-02-14 15:26:15 -08:00
pack-objects.h pack-objects: drop unused parameter from oe_map_new_pack() 2019-02-14 15:26:15 -08:00
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
packfile.c
packfile.h
pager.c trace2:data: add editor/pager child classification 2019-02-22 15:27:59 -08:00
parse-options-cb.c checkout: split options[] array in three pieces 2019-04-02 13:56:59 +09:00
parse-options.c
parse-options.h checkout: split options[] array in three pieces 2019-04-02 13:56:59 +09:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c
path.h
pathspec.c Merge branch 'nd/the-index-final' 2019-02-06 22:05:23 -08:00
pathspec.h
pkt-line.c remote-curl: use post_rpc() for protocol v2 also 2019-03-03 19:00:42 +09:00
pkt-line.h remote-curl: use post_rpc() for protocol v2 also 2019-03-03 19:00:42 +09:00
preload-index.c
pretty.c Merge branch 'nd/completion-more-parameters' 2019-03-07 09:59:58 +09:00
pretty.h
prio-queue.c
prio-queue.h
progress.c
progress.h
prompt.c
prompt.h
protocol.c
protocol.h
quote.c
quote.h
range-diff.c
range-diff.h
reachable.c prune: use bitmaps for reachability traversal 2019-02-14 15:25:33 -08:00
reachable.h
read-cache.c Merge branch 'jh/trace2' 2019-03-07 09:59:56 +09:00
rebase-interactive.c
rebase-interactive.h
ref-filter.c Merge branch 'nd/completion-more-parameters' 2019-03-07 09:59:58 +09:00
ref-filter.h
reflog-walk.c
reflog-walk.h
refs.c
refs.h
refspec.c
refspec.h
remote-curl.c Merge branch 'jt/http-auth-proto-v2-fix' 2019-03-07 10:00:00 +09:00
remote-testsvn.c
remote.c
remote.h
replace-object.c
replace-object.h
repository.c trace2: create new combined trace facility 2019-02-22 15:27:59 -08:00
repository.h trace2: create new combined trace facility 2019-02-22 15:27:59 -08:00
rerere.c
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'en/combined-all-paths' 2019-03-07 09:59:54 +09:00
revision.h Merge branch 'en/combined-all-paths' 2019-03-07 09:59:54 +09:00
run-command.c trace2: create new combined trace facility 2019-02-22 15:27:59 -08:00
run-command.h trace2: create new combined trace facility 2019-02-22 15:27:59 -08:00
send-pack.c Merge branch 'jk/loose-object-cache-oid' 2019-02-06 22:05:27 -08:00
send-pack.h
sequencer.c Merge branch 'jh/trace2' 2019-03-07 09:59:56 +09:00
sequencer.h Merge branch 'rj/sequencer-sign-off-header-static' 2019-02-13 18:18:41 -08:00
serve.c
serve.h
server-info.c
setup.c
sh-i18n--envsubst.c trace2: create new combined trace facility 2019-02-22 15:27:59 -08:00
sha1-array.c
sha1-array.h
sha1-file.c Merge branch 'jk/loose-object-cache-oid' 2019-02-06 22:05:27 -08:00
sha1-lookup.c
sha1-lookup.h
sha1-name.c doc: promote "git switch" 2019-04-02 13:57:00 +09:00
sha1dc_git.c
sha1dc_git.h
shallow.c
shell.c
shortlog.h
sideband.c
sideband.h
sigchain.c
sigchain.h
split-index.c Merge branch 'nd/split-index-null-base-fix' 2019-03-07 09:59:56 +09:00
split-index.h
strbuf.c
strbuf.h
streaming.c Merge branch 'jk/loose-object-cache-oid' 2019-02-06 22:05:27 -08:00
streaming.h
string-list.c
string-list.h
sub-process.c trace2:data: add trace2 sub-process classification 2019-02-22 15:28:12 -08:00
sub-process.h
submodule-config.c completion: add more parameter value completion 2019-02-20 12:31:56 -08:00
submodule-config.h
submodule.c Merge branch 'nd/completion-more-parameters' 2019-03-07 09:59:58 +09:00
submodule.h
symlinks.c
tag.c
tag.h
tar.h
tempfile.c
tempfile.h
thread-utils.c
thread-utils.h
tmp-objdir.c
tmp-objdir.h
trace.c
trace.h
trace2.c trace2: create new combined trace facility 2019-02-22 15:27:59 -08:00
trace2.h trace2: collect Windows-specific process information 2019-02-22 15:27:59 -08:00
trailer.c
trailer.h
transport-helper.c trace2:data: add trace2 transport child classification 2019-02-22 15:28:14 -08:00
transport-internal.h
transport.c trace2:data: add trace2 hook classification 2019-02-22 15:28:21 -08:00
transport.h
tree-diff.c
tree-walk.c Merge branch 'dt/cat-file-batch-ambiguous' 2019-02-06 22:05:21 -08:00
tree-walk.h Merge branch 'dt/cat-file-batch-ambiguous' 2019-02-06 22:05:21 -08:00
tree.c Merge branch 'nd/the-index-final' 2019-02-06 22:05:23 -08:00
tree.h
unicode-width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c doc: promote "git switch" 2019-04-02 13:57:00 +09:00
unpack-trees.h
upload-pack.c
upload-pack.h
url.c
url.h
urlmatch.c
urlmatch.h
usage.c trace2: create new combined trace facility 2019-02-22 15:27:59 -08:00
userdiff.c
userdiff.h
utf8.c utf8: handle systems that don't write BOM for UTF-16 2019-02-11 18:20:07 -08:00
utf8.h
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c
walker.h
wildmatch.c
wildmatch.h
worktree.c
worktree.h
wrap-for-bin.sh
wrapper.c
write-or-die.c
ws.c
wt-status.c doc: promote "git restore" 2019-05-07 13:04:48 +09:00
wt-status.h
xdiff-interface.c completion: add more parameter value completion 2019-02-20 12:31:56 -08:00
xdiff-interface.h
zlib.c

README.md

Build Status

Git - fast, scalable, distributed revision control system

Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations and full access to internals.

Git is an Open Source project covered by the GNU General Public License version 2 (some parts of it are under different licenses, compatible with the GPLv2). It was originally written by Linus Torvalds with help of a group of hackers around the net.

Please read the file INSTALL for installation instructions.

Many Git online resources are accessible from https://git-scm.com/ including full documentation and Git related tools.

See Documentation/gittutorial.txt to get started, then see Documentation/giteveryday.txt for a useful minimum set of commands, and Documentation/git-.txt for documentation of each command. If git has been correctly installed, then the tutorial can also be read with man gittutorial or git help tutorial, and the documentation of each command with man git-<commandname> or git help <commandname>.

CVS users may also want to read Documentation/gitcvs-migration.txt (man gitcvs-migration or git help cvs-migration if git is installed).

The user discussion and development of Git take place on the Git mailing list -- everyone is welcome to post bug reports, feature requests, comments and patches to git@vger.kernel.org (read Documentation/SubmittingPatches for instructions on patch submission). To subscribe to the list, send an email with just "subscribe git" in the body to majordomo@vger.kernel.org. The mailing list archives are available at https://public-inbox.org/git/, http://marc.info/?l=git and other archival sites.

Issues which are security relevant should be disclosed privately to the Git Security mailing list git-security@googlegroups.com.

The maintainer frequently sends the "What's cooking" reports that list the current status of various development topics to the mailing list. The discussion following them give a good reference for project status, development direction and remaining tasks.

The name "git" was given by Linus Torvalds when he wrote the very first version. He described the tool as "the stupid content tracker" and the name as (depending on your mood):

  • random three-letter combination that is pronounceable, and not actually used by any common UNIX command. The fact that it is a mispronunciation of "get" may or may not be relevant.
  • stupid. contemptible and despicable. simple. Take your pick from the dictionary of slang.
  • "global information tracker": you're in a good mood, and it actually works for you. Angels sing, and a light suddenly fills the room.
  • "goddamn idiotic truckload of sh*t": when it breaks