1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-30 13:57:54 +01:00
Find a file
Junio C Hamano 1016658de3 merge: small leakfix and code simplification
When parsing a merged object name like "foo~20" to formulate a merge
summary "Merge branch foo (early part)", a temporary strbuf is used,
but we forgot to deallocate it when we failed to find the named
branch.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-04-29 13:17:52 -07:00
block-sha1
builtin merge: small leakfix and code simplification 2015-04-29 13:17:52 -07:00
compat Merge branch 'js/windows-open-eisdir-error' into maint 2014-12-22 12:17:13 -08:00
contrib Merge branch 'js/diff-highlight-avoid-sigpipe' 2014-11-10 11:26:09 -08:00
Documentation Git 2.2.2 2015-01-12 14:06:12 -08:00
ewah
git-gui
gitk-git Merge git://ozlabs.org/~paulus/gitk 2014-10-30 10:07:33 -07:00
gitweb gitweb: hack around CGI's list-context param() handling 2014-11-18 11:23:10 -08:00
mergetools Merge branch 'oc/mergetools-beyondcompare' 2014-10-29 10:08:04 -07:00
perl git-svn: use SVN::Ra::get_dir2 when possible 2014-10-31 10:34:54 +00:00
po l10n: de.po: fix typos 2014-11-28 19:08:50 +01:00
ppc
t t5520: test pulling an octopus into an unborn branch 2015-04-29 13:17:52 -07:00
templates
vcs-svn
xdiff
.gitattributes
.gitignore Merge branch 'cc/interpret-trailers' 2014-10-20 12:25:32 -07:00
.mailmap .mailmap: add Stefan Bellers corporate mail address 2014-10-21 11:01:27 -07:00
abspath.c
aclocal.m4
advice.c
advice.h
alias.c
alloc.c
archive-tar.c Revert "archive: honor tar.umask even for pax headers" 2014-10-20 12:04:46 -07:00
archive-zip.c
archive.c
archive.h
argv-array.c
argv-array.h
attr.c
attr.h
base85.c
bisect.c
bisect.h
blob.c
blob.h
branch.c
branch.h
builtin.h
bulk-checkin.c
bulk-checkin.h
bundle.c bundle: split out ref writing from bundle_create 2014-10-30 14:52:45 -07:00
bundle.h
cache-tree.c Merge branch 'jk/cache-tree-protect-from-broken-libgit2' 2014-11-06 10:51:35 -08:00
cache-tree.h
cache.h Sync with v2.1.4 2014-12-17 11:46:57 -08:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
column.c use child_process_init() to initialize struct child_process variables 2014-10-28 14:56:17 -07:00
column.h
combine-diff.c
command-list.txt
commit-slab.h
commit.c
commit.h
config.c Merge branch 'rs/maint-config-use-labs' into maint 2014-12-22 12:17:23 -08:00
config.mak.in
config.mak.uname Sync with v2.1.4 2014-12-17 11:46:57 -08:00
configure.ac
connect.c
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 Merge branch 'rs/daemon-fixes' into maint 2014-10-29 10:35:09 -07:00
date.c Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates' into maint 2015-01-12 14:01:18 -08:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
diff-no-index.c
diff.c Merge branch 'jn/parse-config-slot' 2014-10-20 12:23:48 -07:00
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir.c Merge branch 'nd/dir-prep-exclude-cleanup' 2014-10-24 15:00:05 -07:00
dir.h
editor.c
entry.c
environment.c Sync with v2.0.5 2014-12-17 11:42:28 -08:00
exec_cmd.c
exec_cmd.h
fast-import.c
fetch-pack.c
fetch-pack.h
fmt-merge-msg.h
fsck.c Sync with v2.1.4 2014-12-17 11:46:57 -08:00
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl
git-am.sh
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'dm/port2zos' 2014-10-29 10:08:07 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh difftool: add support for --trust-exit-code 2014-10-28 10:36:57 -07:00
git-difftool.perl Merge branch 'da/difftool' 2014-10-29 10:09:35 -07:00
git-filter-branch.sh
git-instaweb.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh Merge branch 'da/difftool' 2014-11-18 10:16:55 -08:00
git-mergetool.sh Merge branch 'da/mergetool-temporary-directory' 2014-10-21 13:28:42 -07:00
git-p4.py
git-parse-remote.sh
git-pull.sh
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh
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 Merge branch 'da/mergetool-tool-help' 2014-10-21 13:28:37 -07:00
git-stash.sh
git-submodule.sh
git-svn.perl
GIT-VERSION-GEN Git 2.2.2 2015-01-12 14:06:12 -08:00
git-web--browse.sh
git.c Merge branch 'cc/interpret-trailers' 2014-10-20 12:25:32 -07:00
git.rc
git.spec.in
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c Merge branch 'rs/grep-color-words' 2014-10-31 11:49:47 -07:00
grep.h grep: add color.grep.matchcontext and color.grep.matchselected 2014-10-28 10:33:50 -07:00
hashmap.c
hashmap.h
help.c
help.h
hex.c
http-backend.c Merge branch 'rs/run-command-env-array' 2014-10-24 14:57:54 -07:00
http-fetch.c
http-push.c
http-walker.c
http.c
http.h
ident.c
imap-send.c
INSTALL
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1
line-log.c Merge branch 'tm/line-log-first-parent' 2014-11-06 10:52:37 -08:00
line-log.h
line-range.c
line-range.h
list-objects.c
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c
lockfile.h
log-tree.c Merge branch 'jn/parse-config-slot' 2014-10-20 12:23:48 -07:00
log-tree.h Merge branch 'jn/parse-config-slot' 2014-10-20 12:23:48 -07:00
mailmap.c
mailmap.h
Makefile Merge branch 'jk/rebuild-perl-scripts-with-no-perl-seting-change' into maint 2014-12-22 12:18:35 -08:00
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
notes-merge.h
notes-utils.c
notes-utils.h
notes.c
notes.h
object.c
object.h
pack-bitmap-write.c
pack-bitmap.c
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 Sync with v2.1.4 2014-12-17 11:46:57 -08:00
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Merge branch 'jn/parse-config-slot' 2014-10-20 12:23:48 -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 Sync with v2.1.4 2014-12-17 11:46:57 -08:00
README
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'jk/read-packed-refs-without-path-max' into maint 2015-01-12 14:02:54 -08:00
refs.h
RelNotes Prepare for 2.2.2 2014-12-22 12:20:38 -08:00
remote-curl.c
remote-testsvn.c
remote.c
remote.h
replace_object.c
rerere.c
rerere.h
resolve-undo.c
resolve-undo.h
revision.c
revision.h
run-command.c run-command: use void to declare that functions take no parameters 2014-11-10 14:43:19 -08:00
run-command.h
send-pack.c
send-pack.h
sequencer.c
sequencer.h
server-info.c
setup.c
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'jk/prune-mtime' 2014-10-29 10:07:56 -07:00
sha1_name.c Merge branch 'mh/find-uniq-abbrev' into maint 2015-01-12 14:02:05 -08:00
shallow.c Merge branch 'eb/no-pthreads' 2014-10-24 14:59:10 -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
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-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
trace.h
trailer.c Merge branch 'cc/interpret-trailers' 2014-11-19 13:47:52 -08:00
trailer.h
transport-helper.c use child_process_init() to initialize struct child_process variables 2014-10-28 14:56:17 -07:00
transport.c Merge branch 'sb/plug-transport-leak' 2014-10-24 15:00:09 -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 Sync with v2.0.5 2014-12-17 11:42:28 -08:00
unpack-trees.h
update_unicode.sh
upload-pack.c
url.c
url.h
urlmatch.c
urlmatch.h
usage.c
userdiff.c
userdiff.h
utf8.c Merge branch 'maint-2.1' into maint 2015-01-07 13:28:10 -08:00
utf8.h utf8: add is_hfs_dotgit() helper 2014-12-17 11:04:39 -08:00
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c
walker.h
wildmatch.c
wildmatch.h
wrap-for-bin.sh
wrapper.c
write_or_die.c
ws.c
wt-status.c Merge branch 'rs/run-command-env-array' 2014-10-24 14:57:54 -07:00
wt-status.h
xdiff-interface.c
xdiff-interface.h
zlib.c

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

	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.