Go to file
Aaron M Watson a56c8f5aab stash: allow stashes to be referenced by index only
Instead of referencing "stash@{n}" explicitly, make it possible to
simply reference as "n".  Most users only reference stashes by their
position in the stash stack (what I refer to as the "index" here).

The syntax for the typical stash (stash@{n}) is slightly annoying and
easy to forget, and sometimes difficult to escape properly in a
script. Because of this the capability to do things with the stash by
simply referencing the index is desirable.

This patch includes the superior implementation provided by Øsse Walle
(thanks for that), with a slight change to fix a broken test in the test
suite. I also merged the test scripts as suggested by Jeff King, and
un-wrapped the documentation as suggested by Junio Hamano.

Signed-off-by: Aaron M Watson <watsona4@gmail.com>
Reviewed-by: Jeff King <peff@peff.net>
2016-10-26 09:58:10 -07:00
Documentation stash: allow stashes to be referenced by index only 2016-10-26 09:58:10 -07:00
block-sha1
builtin Merge branch 'js/reset-usage' 2016-10-17 13:25:22 -07:00
ci
compat
contrib Merge branch 'rs/cocci' 2016-10-17 13:25:21 -07:00
ewah
git-gui Merge branch 'rs/git-gui-use-modern-git-merge-syntax' into maint 2016-10-11 14:20:37 -07:00
gitk-git
gitweb gitweb: use highlight's shebang detection 2016-09-25 16:39:11 -07:00
mergetools
perl
po Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ru 2016-10-16 20:11:41 +08:00
ppc
refs Merge branch 'jk/ref-symlink-loop' 2016-10-17 13:25:20 -07:00
t stash: allow stashes to be referenced by index only 2016-10-26 09:58:10 -07:00
templates
vcs-svn Merge branch 'mr/vcs-svn-printf-ulong' into maint 2016-09-29 16:49:37 -07:00
xdiff Merge branch 'mh/diff-indent-heuristic' 2016-10-03 13:30:38 -07:00
.gitattributes
.gitignore
.mailmap add David Turner's Two Sigma address 2016-09-26 17:46:44 -07:00
.travis.yml Merge branch 'ls/travis-homebrew-path-fix' into maint 2016-09-29 16:49:45 -07:00
COPYING
GIT-VERSION-GEN Git 2.10.1 2016-10-03 13:24:18 -07:00
INSTALL
LGPL-2.1
Makefile Merge branch 'jk/quarantine-received-objects' 2016-10-17 13:25:20 -07:00
README.md
RelNotes Start preparing for 2.10.2 2016-10-11 14:24:02 -07:00
abspath.c
aclocal.m4
advice.c
advice.h
alias.c
alloc.c
apply.c introduce CHECKOUT_INIT 2016-09-22 13:42:18 -07:00
apply.h
archive-tar.c
archive-zip.c
archive.c
archive.h
argv-array.c
argv-array.h
attr.c
attr.h
base85.c
bisect.c use QSORT 2016-09-29 15:42:18 -07:00
bisect.h
blob.c
blob.h
branch.c
branch.h
builtin.h
bulk-checkin.c
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'jk/quarantine-received-objects' 2016-10-17 13:25:20 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
column.c
column.h
combine-diff.c
command-list.txt
commit-slab.h
commit.c Merge branch 'rs/copy-array' into maint 2016-10-11 14:18:32 -07:00
commit.h Merge branch 'nd/shallow-deepen' 2016-10-10 14:03:50 -07:00
common-main.c
config.c get_short_sha1: make default disambiguation configurable 2016-09-27 10:29:56 -07:00
config.mak.in
config.mak.uname
configure.ac Merge branch 'js/regexec-buf' 2016-10-17 13:25:21 -07:00
connect.c Merge branch 'va/i18n-more' 2016-09-26 16:09:18 -07:00
connect.h
connected.c check_connected: accept an env argument 2016-10-10 13:54:02 -07:00
connected.h check_connected: accept an env argument 2016-10-10 13:54:02 -07:00
convert.c
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
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
diff-no-index.c Merge branch 'jk/setup-sequence-update' 2016-09-21 15:15:24 -07:00
diff.c Merge branch 'rs/qsort' 2016-10-10 14:03:46 -07:00
diff.h Merge branch 'mh/diff-indent-heuristic' 2016-09-26 16:09:16 -07:00
diffcore-break.c
diffcore-delta.c use QSORT 2016-09-29 15:42:18 -07:00
diffcore-order.c use QSORT 2016-09-29 15:42:18 -07:00
diffcore-pickaxe.c Merge branch 'js/regexec-buf' into maint 2016-09-29 16:49:45 -07:00
diffcore-rename.c use QSORT 2016-09-29 15:42:18 -07:00
diffcore.h
dir-iterator.c
dir-iterator.h
dir.c use QSORT 2016-09-29 15:42:18 -07:00
dir.h
editor.c
entry.c
environment.c Merge branch 'jk/setup-sequence-update' 2016-09-21 15:15:24 -07:00
exec_cmd.c
exec_cmd.h
fast-import.c use QSORT 2016-09-29 15:42:18 -07:00
fetch-pack.c Merge branch 'nd/shallow-deepen' 2016-10-10 14:03:50 -07:00
fetch-pack.h
fmt-merge-msg.h
fsck.c fsck: handle bad trees like other errors 2016-09-27 14:09:10 -07:00
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'rs/copy-array' into maint 2016-10-11 14:18:32 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh
git-instaweb.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh mergetool: honor -O<orderfile> 2016-10-11 10:04:31 -07:00
git-p4.py
git-parse-remote.sh
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh Merge branch 'rt/rebase-i-broken-insn-advise' into maint 2016-09-29 16:49:46 -07:00
git-rebase--merge.sh
git-rebase.sh
git-relink.perl
git-remote-testgit.sh
git-request-pull.sh
git-send-email.perl
git-sh-i18n.sh
git-sh-setup.sh
git-stash.sh stash: allow stashes to be referenced by index only 2016-10-26 09:58:10 -07:00
git-submodule.sh clone: pass --progress decision to recursive submodules 2016-09-22 11:22:47 -07:00
git-svn.perl
git-web--browse.sh
git.c Merge branch 'jk/setup-sequence-update' 2016-09-21 15:15:24 -07:00
git.rc
gpg-interface.c
gpg-interface.h
graph.c Merge branch 'jk/graph-padding-fix' into maint 2016-10-11 14:19:03 -07:00
graph.h
grep.c Merge branch 'js/regexec-buf' into maint 2016-09-29 16:49:45 -07:00
grep.h
hashmap.c
hashmap.h
help.c use QSORT 2016-09-29 15:42:18 -07:00
help.h
hex.c
http-backend.c
http-fetch.c
http-push.c
http-walker.c
http.c Merge branch 'dt/http-empty-auth' 2016-10-17 13:25:18 -07:00
http.h
ident.c Merge branch 'jk/ident-ai-canonname-could-be-null' into maint 2016-10-03 13:22:32 -07:00
imap-send.c Merge branch 'ak/curl-imap-send-explicit-scheme' 2016-10-10 14:03:48 -07:00
iterator.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
line-log.c use QSORT 2016-09-29 15:42:18 -07:00
line-log.h
line-range.c
line-range.h
list-objects.c
list-objects.h
list.h
ll-merge.c
ll-merge.h
lockfile.c
lockfile.h
log-tree.c
log-tree.h
mailinfo.c Merge branch 'kd/mailinfo-quoted-string' 2016-10-03 13:30:38 -07:00
mailinfo.h
mailmap.c
mailmap.h
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c Merge branch 'rs/cocci' 2016-10-17 13:25:21 -07:00
merge-recursive.h
merge.c
mergesort.c
mergesort.h
mru.c
mru.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c Merge branch 'va/i18n-more' 2016-09-26 16:09:18 -07:00
notes-merge.h
notes-utils.c
notes-utils.h
notes.c
notes.h
object.c
object.h
pack-bitmap-write.c use QSORT 2016-09-29 15:42:18 -07:00
pack-bitmap.c
pack-bitmap.h
pack-check.c Merge branch 'jk/verify-packfile-gently' into maint 2016-10-11 14:21:36 -07:00
pack-objects.c
pack-objects.h
pack-revindex.c use COPY_ARRAY 2016-09-25 16:44:13 -07:00
pack-revindex.h
pack-write.c use QSORT 2016-09-29 15:42:18 -07:00
pack.h
pager.c Merge branch 'jk/setup-sequence-update' 2016-09-21 15:15:24 -07:00
parse-options-cb.c Merge branch 'rs/cocci' 2016-10-17 13:25:21 -07:00
parse-options.c
parse-options.h Merge branch 'mh/diff-indent-heuristic' 2016-09-26 16:09:16 -07:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c
pathspec.c Merge branch 'rs/qsort' 2016-10-10 14:03:46 -07:00
pathspec.h Merge branch 'bw/pathspec-remove-unused-extern-decl' into maint 2016-09-29 16:49:34 -07:00
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Merge branch 'rs/cocci' 2016-10-17 13:25:21 -07:00
prio-queue.c
prio-queue.h
progress.c
progress.h
prompt.c
prompt.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c Merge branch 'tg/add-chmod+x-fix' into maint 2016-09-29 16:49:47 -07:00
ref-filter.c Merge branch 'rs/qsort' 2016-10-10 14:03:46 -07:00
ref-filter.h
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'nd/shallow-deepen' 2016-10-10 14:03:50 -07:00
refs.h Merge branch 'nd/shallow-deepen' 2016-10-10 14:03:50 -07:00
remote-curl.c Merge branch 'nd/shallow-deepen' 2016-10-10 14:03:50 -07:00
remote-testsvn.c
remote.c
remote.h
replace_object.c
rerere.c
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'vn/revision-shorthand-for-side-branch-log' 2016-10-06 14:53:10 -07:00
revision.h
run-command.c
run-command.h
send-pack.c
send-pack.h
sequencer.c
sequencer.h
server-info.c use QSORT 2016-09-29 15:42:18 -07:00
setup.c
sh-i18n--envsubst.c remove unnecessary check before QSORT 2016-09-29 15:42:18 -07:00
sha1-array.c Merge branch 'rs/qsort' 2016-10-10 14:03:46 -07:00
sha1-array.h sha1_array: let callbacks interrupt iteration 2016-09-26 11:46:41 -07:00
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'jk/alt-odb-cleanup' 2016-10-17 13:25:20 -07:00
sha1_name.c Merge branch 'jk/alt-odb-cleanup' 2016-10-17 13:25:20 -07:00
shallow.c Merge branch 'nd/shallow-deepen' 2016-10-10 14:03:50 -07:00
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
split-index.c use COPY_ARRAY 2016-09-25 16:44:13 -07:00
split-index.h
strbuf.c link_alt_odb_entry: handle normalize_path errors 2016-10-10 13:52:36 -07:00
strbuf.h link_alt_odb_entry: handle normalize_path errors 2016-10-10 13:52:36 -07:00
streaming.c Merge branch 'jk/pack-objects-optim-mru' 2016-10-10 14:03:47 -07:00
streaming.h
string-list.c use QSORT 2016-09-29 15:42:18 -07:00
string-list.h
submodule-config.c
submodule-config.h
submodule.c Merge branch 'rs/cocci' 2016-10-17 13:25:21 -07: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: do not migrate files starting with '.' 2016-10-10 13:54:02 -07:00
tmp-objdir.h tmp-objdir: introduce API for temporary object directories 2016-10-10 13:54:02 -07:00
trace.c
trace.h
trailer.c
trailer.h
transport-helper.c Merge branch 'nd/shallow-deepen' 2016-10-10 14:03:50 -07:00
transport.c Merge branch 'jk/alt-odb-cleanup' 2016-10-17 13:25:20 -07:00
transport.h Merge branch 'nd/shallow-deepen' 2016-10-10 14:03:50 -07:00
tree-diff.c
tree-walk.c fsck: handle bad trees like other errors 2016-09-27 14:09:10 -07:00
tree-walk.h fsck: handle bad trees like other errors 2016-09-27 14:09:10 -07:00
tree.c use QSORT 2016-09-29 15:42:18 -07:00
tree.h
unicode_width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'rs/unpack-trees-reduce-file-scope-global' into maint 2016-09-29 16:49:36 -07:00
unpack-trees.h
update_unicode.sh
upload-pack.c Merge branch 'nd/shallow-deepen' 2016-10-10 14:03:50 -07:00
url.c
url.h
urlmatch.c
urlmatch.h
usage.c
userdiff.c
userdiff.h
utf8.c
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 Merge branch 'rs/cocci' 2016-10-17 13:25:21 -07:00
wt-status.h
xdiff-interface.c Merge branch 'js/regexec-buf' into maint 2016-09-29 16:49:45 -07:00
xdiff-interface.h
zlib.c

README.md

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 http://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 http://news.gmane.org/gmane.comp.version-control.git/, http://marc.info/?l=git and other archival sites.

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