Go to file
Junio C Hamano 39743cf554 rebase-i: work around Windows CRLF line endings
Editors on Windows can and do save text files with CRLF line
endings, which is the convention on the platform.  We are seeing
reports that the "read" command in a port of bash to the environment
however does not strip the CRLF at the end, not adjusting for the
same convention on the platform.

This breaks the recently added sanity checks for the insn sheet fed
to "rebase -i"; instead of an empty line (hence nothing in $command),
the script was getting a lone CR in there.

Special case a lone CR and treat it the same way as an empty line to
work this around.

This patch (also) passes the test with Git for Windows, where the
issue was seen first.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-10-28 10:06:46 -07:00
Documentation git rebase -i: warn about removed commits 2015-06-30 12:14:25 -07:00
block-sha1
builtin Merge branch 'jc/hash-object' into maint 2015-05-26 13:49:25 -07:00
compat Merge branch 'nd/untracked-cache' 2015-05-26 13:24:46 -07:00
contrib Merge branch 'sg/complete-decorate-full-not-long' into maint 2015-05-26 13:49:22 -07:00
ewah
git-gui git-gui 0.20.0 2015-04-18 18:35:48 -07:00
gitk-git
gitweb
mergetools
perl
po git-gui: sv.po: Update Swedish translation (547t0f0u) 2015-04-18 12:03:50 +01:00
ppc
t rebase-i: work around Windows CRLF line endings 2015-10-28 10:06:46 -07:00
templates Merge branch 'nd/multiple-work-trees' 2015-05-11 14:23:39 -07:00
vcs-svn
xdiff
.gitattributes
.gitignore
.mailmap
COPYING
GIT-VERSION-GEN Git 2.4.2 2015-05-26 13:49:59 -07:00
INSTALL
LGPL-2.1
Makefile Merge branch 'nd/untracked-cache' 2015-05-26 13:24:46 -07:00
README
RelNotes Git 2.4.2 2015-05-26 13:49:59 -07:00
abspath.c
aclocal.m4
advice.c
advice.h
alias.c
alloc.c
archive-tar.c
archive-zip.c Merge branch 'bc/object-id' 2015-05-05 21:00:23 -07:00
archive.c Merge branch 'bc/object-id' 2015-05-05 21:00:23 -07:00
archive.h
argv-array.c
argv-array.h
attr.c Merge branch 'cn/bom-in-gitignore' into maint 2015-05-13 14:05:51 -07:00
attr.h
base85.c
bisect.c
bisect.h
blob.c
blob.h
branch.c
branch.h
builtin.h
bulk-checkin.c Merge branch 'bc/object-id' 2015-05-05 21:00:23 -07:00
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'jc/hash-object' into maint 2015-05-26 13:49:25 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
column.c
column.h
combine-diff.c
command-list.txt command-list.txt: fix whitespace inconsistency 2015-05-08 12:36:20 -07:00
commit-slab.h
commit.c
commit.h Merge branch 'bc/object-id' 2015-05-05 21:00:23 -07:00
config.c Merge branch 'cn/bom-in-gitignore' into maint 2015-05-13 14:05:51 -07:00
config.mak.in
config.mak.uname
configure.ac
connect.c Merge branch 'bc/connect-plink' 2015-05-19 13:17:55 -07:00
connect.h
connected.c
connected.h
convert.c filter_buffer_or_fd(): ignore EPIPE 2015-05-20 10:19:12 -07:00
convert.h
copy.c copy.c: make copy_fd() report its status silently 2015-05-19 14:48:54 -07:00
credential-cache--daemon.c
credential-cache.c
credential-store.c Merge branch 'pt/xdg-config-path' 2015-05-11 14:24:01 -07:00
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c Merge branch 'jc/daemon-no-ipv6-for-2.4.1' 2015-05-11 14:23:53 -07:00
date.c Merge branch 'jc/epochtime-wo-tz' into maint-2.3 2015-05-11 14:33:58 -07:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c Merge branch 'nd/diff-i-t-a' 2015-05-19 13:17:49 -07:00
diff-no-index.c
diff.c
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir.c Merge branch 'nd/untracked-cache' 2015-05-26 13:24:46 -07:00
dir.h Merge branch 'nd/untracked-cache' 2015-05-26 13:24:46 -07:00
editor.c
entry.c
environment.c Merge branch 'nd/multiple-work-trees' 2015-05-11 14:23:39 -07:00
exec_cmd.c Merge branch 'jk/git-no-more-argv0-path-munging' into maint 2015-05-26 13:49:18 -07:00
exec_cmd.h
fast-import.c Merge branch 'nd/multiple-work-trees' 2015-05-11 14:23:39 -07:00
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
git-am.sh Merge branch 'nd/multiple-work-trees' 2015-05-11 14:23:39 -07:00
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'nd/untracked-cache' 2015-05-26 13:24:46 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl merge: deprecate 'git merge <message> HEAD <commit>' syntax 2015-04-29 13:28:10 -07:00
git-cvsserver.perl
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh filter-branch: avoid passing commit message through sed 2015-04-29 10:01:04 -07:00
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 Merge branch 'va/p4-client-path' 2015-05-11 14:23:48 -07:00
git-parse-remote.sh
git-pull.sh Merge branch 'pt/pull-ff-vs-merge-ff' 2015-05-26 13:24:44 -07:00
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh rebase-i: work around Windows CRLF line endings 2015-10-28 10:06:46 -07:00
git-rebase--merge.sh
git-rebase.sh Merge branch 'jk/rebase-quiet-noop' into maint 2015-05-26 13:49:23 -07:00
git-relink.perl
git-remote-testgit.sh
git-request-pull.sh
git-send-email.perl
git-sh-i18n.sh
git-sh-setup.sh Merge branch 'nd/multiple-work-trees' 2015-05-11 14:23:39 -07:00
git-stash.sh Merge branch 'jk/stash-require-clean-index' 2015-05-19 13:17:52 -07:00
git-submodule.sh
git-svn.perl
git-web--browse.sh
git.c Merge branch 'nd/multiple-work-trees' 2015-05-11 14:23:39 -07:00
git.rc
git.spec.in
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c
grep.h
hashmap.c
hashmap.h
help.c
help.h
hex.c
http-backend.c
http-fetch.c
http-push.c
http-walker.c
http.c Merge branch 'ls/http-ssl-cipher-list' 2015-05-22 12:41:45 -07:00
http.h
ident.c
imap-send.c
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
line-log.c Merge branch 'sb/line-log-plug-pairdiff-leak' into maint 2015-05-13 14:05:56 -07:00
line-log.h
line-range.c
line-range.h
list-objects.c
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c Merge branch 'jc/ignore-epipe-in-filter' 2015-05-22 12:41:57 -07:00
lockfile.h lockfile: allow file locking to be retried with a timeout 2015-05-14 14:51:08 -07:00
log-tree.c Merge branch 'mg/log-decorate-HEAD' 2015-05-22 12:41:51 -07:00
log-tree.h
mailmap.c
mailmap.h
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c
merge-recursive.h
merge.c
mergesort.c
mergesort.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c Merge branch 'nd/multiple-work-trees' 2015-05-11 14:23:39 -07:00
notes-merge.h
notes-utils.c
notes-utils.h
notes.c
notes.h
object.c Merge branch 'jk/type-from-string-gently' into maint 2015-05-13 14:05:54 -07:00
object.h
pack-bitmap-write.c
pack-bitmap.c Merge branch 'rs/plug-leak-in-pack-bitmaps' 2015-05-26 13:24:44 -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 Merge branch 'iu/fix-parse-options-h-comment' into maint 2015-04-21 12:12:20 -07:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c Merge branch 'pt/xdg-config-path' 2015-05-11 14:24:01 -07:00
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
pretty.c
prio-queue.c
prio-queue.h
progress.c progress: treat "no terminal" as being in the foreground 2015-05-19 09:35:14 -07:00
progress.h
prompt.c
prompt.h
quote.c
quote.h
reachable.c reachable: only mark local objects as recent 2015-04-20 13:09:27 -07:00
reachable.h
read-cache.c Merge branch 'nd/untracked-cache' 2015-05-26 13:24:46 -07:00
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'mh/lockfile-retry' 2015-05-22 12:41:55 -07:00
refs.h Merge branch 'nd/multiple-work-trees' 2015-05-11 14:23:39 -07:00
remote-curl.c
remote-testsvn.c
remote.c
remote.h
replace_object.c
rerere.c Merge branch 'jk/rerere-forget-check-enabled' 2015-05-26 13:24:42 -07:00
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'jk/still-interesting' into maint 2015-05-26 13:49:26 -07:00
revision.h
run-command.c Merge branch 'nd/multiple-work-trees' 2015-05-11 14:23:39 -07:00
run-command.h Merge branch 'nd/multiple-work-trees' 2015-05-11 14:23:39 -07:00
send-pack.c Merge branch 'bc/object-id' 2015-05-05 21:00:23 -07:00
send-pack.h
sequencer.c
sequencer.h
server-info.c
setup.c Merge branch 'nd/dwim-wildcards-as-pathspecs' 2015-05-19 13:17:58 -07:00
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'jc/hash-object' into maint 2015-05-26 13:49:25 -07:00
sha1_name.c
shallow.c Merge branch 'bc/object-id' 2015-05-05 21:00: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
strbuf.h
streaming.c
streaming.h
string-list.c
string-list.h
submodule.c Merge branch 'nd/multiple-work-trees' 2015-05-11 14:23:39 -07:00
submodule.h
symlinks.c
tag.c
tag.h
tar.h
test-chmtime.c
test-config.c
test-ctype.c
test-date.c
test-delta.c
test-dump-cache-tree.c
test-dump-split-index.c
test-dump-untracked-cache.c
test-genrandom.c
test-hashmap.c
test-index-version.c
test-line-buffer.c
test-match-trees.c
test-mergesort.c
test-mktemp.c
test-parse-options.c
test-path-utils.c
test-prio-queue.c
test-read-cache.c
test-regex.c
test-revision-walking.c
test-run-command.c
test-scrap-cache-tree.c
test-sha1-array.c
test-sha1.c
test-sha1.sh
test-sigchain.c
test-string-list.c
test-subprocess.c
test-svn-fe.c
test-urlmatch-normalization.c
test-wildmatch.c
thread-utils.c
thread-utils.h
trace.c Merge branch 'nd/multiple-work-trees' 2015-05-11 14:23:39 -07:00
trace.h
trailer.c
trailer.h
transport-helper.c
transport.c Merge branch 'nd/multiple-work-trees' 2015-05-11 14:23:39 -07:00
transport.h
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
tree.h
unicode_width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c
unpack-trees.h
update_unicode.sh
upload-pack.c Merge branch 'bc/object-id' 2015-05-05 21:00:23 -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
wrap-for-bin.sh
wrapper.c Merge branch 'nd/multiple-work-trees' 2015-05-11 14:23:39 -07:00
write_or_die.c
ws.c
wt-status.c Merge branch 'nd/untracked-cache' 2015-05-26 13:24:46 -07:00
wt-status.h
xdiff-interface.c
xdiff-interface.h
zlib.c

README

////////////////////////////////////////////////////////////////

	Git - the stupid content tracker

////////////////////////////////////////////////////////////////

"git" can mean anything, 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

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.

See Documentation/gittutorial.txt to get started, then see
Documentation/giteveryday.txt for a useful minimum set of commands, and
Documentation/git-commandname.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).

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

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.