Find a file
Nicolas Morey-Chaisemartin bbffd87d32 stash: clean untracked files before reset
If calling git stash -u on a repo that contains a file that is not
ignored any more due to a current modification of the gitignore file,
this file is stashed but not remove from the working tree.
This is due to git-stash first doing a reset --hard which clears the
.gitignore file modification and the call git clean, leaving the file
untouched.
This causes git stash pop to fail due to the file existing.

This patch simply switches the order between cleaning and resetting
and adds a test for this usecase.

Reported-by: Sam Partington <sam@whiteoctober.co.uk>
Signed-off-by: Nicolas Morey-Chaisemartin <nicolas@morey-chaisemartin.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-08-11 15:11:30 -07:00
.github
block-sha1
builtin Merge branch 'jk/gc-pre-detach-under-hook' into maint 2017-07-31 13:51:05 -07:00
ci
compat Merge branch 'tb/push-to-cygwin-unc-path' 2017-07-18 12:48:09 -07:00
contrib Merge branch 'aw/contrib-subtree-doc-asciidoctor' into maint 2017-07-10 13:59:06 -07:00
Documentation Git 2.14.1 2017-08-04 12:41:54 -07:00
ewah use DIV_ROUND_UP 2017-07-10 14:24:36 -07:00
git-gui
gitk-git
gitweb
mergetools
perl Merge branch 'pw/unquote-path-in-git-pm' 2017-07-10 13:42:50 -07:00
po l10n: zh_CN: review for git v2.14.0 l10n 2017-08-02 08:02:37 +08:00
ppc
refs
sha1collisiondetection@19d97bf5af
sha1dc Merge branch 'ab/sha1dc-maint' 2017-07-06 18:14:44 -07:00
t stash: clean untracked files before reset 2017-08-11 15:11:30 -07:00
templates pre-rebase hook: capture documentation in a <<here document 2017-07-11 08:56:33 -07:00
vcs-svn
xdiff
.gitattributes
.gitignore
.gitmodules
.mailmap
.travis.yml
abspath.c
aclocal.m4
advice.c
advice.h
alias.c Merge branch 'js/alias-case-sensitivity' 2017-07-20 16:29:59 -07:00
alloc.c
apply.c Merge branch 'rs/apply-avoid-over-reading' into maint 2017-07-31 13:51:04 -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
bisect.h
blame.c Merge branch 'js/blame-lib' 2017-07-31 13:05:15 -07:00
blame.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 Git 2.13.5 2017-08-04 12:40:37 -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
commit.h
common-main.c
config.c Merge branch 'sb/hashmap-customize-comparison' 2017-07-13 16:14:54 -07:00
config.h
config.mak.in
config.mak.uname config.mak.uname: set FREAD_READS_DIRECTORIES for cygwin 2017-07-21 11:58:06 -07:00
configure.ac
connect.c Git 2.13.5 2017-08-04 12:40:37 -07:00
connect.h
connected.c
connected.h
convert.c
convert.h
copy.c
COPYING
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 Merge branch 'ab/strbuf-addftime-tzname-boolify' 2017-07-06 18:14:47 -07:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
diff-no-index.c
diff.c Merge branch 'rs/use-div-round-up' 2017-07-12 15:18:23 -07:00
diff.h
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 'ab/wildmatch' 2017-07-10 13:42:51 -07:00
dir.h
editor.c
entry.c
environment.c
exec_cmd.c
exec_cmd.h
fast-import.c
fetch-pack.c
fetch-pack.h
fmt-merge-msg.h
fsck.c
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl Merge branch 'pw/unquote-path-in-git-pm' into maint 2017-07-31 13:51:05 -07:00
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'tb/push-to-cygwin-unc-path' 2017-07-18 12:48:09 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
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
git-p4.py git-p4: filter for {'code':'info'} in p4CmdList 2017-07-13 10:52:42 -07:00
git-parse-remote.sh
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh
git-rebase--merge.sh
git-rebase.sh Merge branch 'pw/rebase-i-regression-fix-tests' into maint 2017-07-10 13:59:00 -07:00
git-remote-testgit.sh
git-request-pull.sh
git-send-email.perl Merge branch 'xz/send-email-batch-size' 2017-07-06 18:14:46 -07:00
git-sh-i18n.sh
git-sh-setup.sh
git-stash.sh stash: clean untracked files before reset 2017-08-11 15:11:30 -07:00
git-submodule.sh
git-svn.perl
GIT-VERSION-GEN Start post 2.14 cycle 2017-08-04 12:44:55 -07:00
git-web--browse.sh
git.c
git.rc
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c
grep.h
hash.h
hashmap.c
hashmap.h
help.c Merge branch 'mb/reword-autocomplete-message' into maint 2017-07-10 13:59:04 -07:00
help.h
hex.c
http-backend.c
http-fetch.c
http-push.c
http-walker.c
http.c
http.h
ident.c
imap-send.c Merge branch 'rs/use-div-round-up' 2017-07-12 15:18:23 -07:00
INSTALL
iterator.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1
line-log.c
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
mailinfo.h
mailmap.c
mailmap.h
Makefile Merge branch 'jc/po-pritime-fix' 2017-07-21 14:57:37 -07:00
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c Merge branch 'sb/merge-recursive-code-cleanup' 2017-07-06 18:14:45 -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
notes-merge.h
notes-utils.c
notes-utils.h
notes.c
notes.h
object.c
object.h
oidset.c
oidset.h
pack-bitmap-write.c
pack-bitmap.c Merge branch 'jc/pack-bitmap-unaligned' into maint 2017-07-10 13:59:00 -07:00
pack-bitmap.h
pack-check.c
pack-objects.c
pack-objects.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
pager.c
parse-options-cb.c
parse-options.c
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c Git 2.13.5 2017-08-04 12:40:37 -07:00
path.h
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Merge branch 'rs/pretty-add-again' into maint 2017-07-10 13:58:57 -07:00
prio-queue.c
prio-queue.h
progress.c progress: show overall rate in last update 2017-07-09 09:54:20 -07:00
progress.h
prompt.c
prompt.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c
README.md
ref-filter.c Merge branch 'kn/ref-filter-branch-list' into maint 2017-07-12 15:23:09 -07:00
ref-filter.h
reflog-walk.c Merge branch 'jk/reflog-walk-maint' 2017-07-10 13:42:53 -07:00
reflog-walk.h
refs.c Merge branch 'sb/hashmap-customize-comparison' 2017-07-13 16:14:54 -07:00
refs.h
RelNotes Git 2.14.1 2017-08-04 12:41:54 -07:00
remote-curl.c
remote-testsvn.c
remote.c
remote.h
replace_object.c
repository.c
repository.h
rerere.c
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'ab/grep-lose-opt-regflags' 2017-07-13 16:14:54 -07:00
revision.h
run-command.c
run-command.h
send-pack.c
send-pack.h
sequencer.c Merge branch 'pw/rebase-i-regression-fix-tests' into maint 2017-07-10 13:59:00 -07:00
sequencer.h
server-info.c
setup.c Merge branch 'js/alias-early-config' into maint 2017-07-10 13:58:58 -07:00
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'ew/fd-cloexec-fix' into maint 2017-07-21 15:03:40 -07:00
sha1_name.c Merge branch 'rs/use-div-round-up' 2017-07-12 15:18:23 -07:00
sha1dc_git.c
sha1dc_git.h
shallow.c Merge branch 'rs/use-div-round-up' 2017-07-12 15:18:23 -07:00
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
split-index.c
split-index.h
strbuf.c Merge branch 'rs/pretty-add-again' into maint 2017-07-10 13:58:57 -07:00
strbuf.h Merge branch 'rs/pretty-add-again' into maint 2017-07-10 13:58:57 -07:00
streaming.c
streaming.h
string-list.c
string-list.h
sub-process.c
sub-process.h
submodule-config.c Merge branch 'sb/pull-rebase-submodule' 2017-07-13 16:14:54 -07:00
submodule-config.h Merge branch 'sb/pull-rebase-submodule' 2017-07-13 16:14:54 -07:00
submodule.c Merge branch 'sb/pull-rebase-submodule' 2017-07-13 16:14:54 -07:00
submodule.h Merge branch 'sb/pull-rebase-submodule' 2017-07-13 16:14:54 -07:00
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
trailer.c
trailer.h
transport-helper.c
transport.c
transport.h
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
tree.h
unicode_width.h unicode: update the width tables to Unicode 10 2017-07-07 10:33:30 -07:00
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c
unpack-trees.h
upload-pack.c
url.c
url.h
urlmatch.c urlmatch: use hex2chr() in append_normalized_escapes() 2017-07-09 09:43:01 -07:00
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/wt-status-cleanup' 2017-07-12 15:18:23 -07:00
wt-status.h
xdiff-interface.c
xdiff-interface.h
zlib.c

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.

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