summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2006-09-29git-diff -B output fix.v1.4.2.2Junio C Hamano1-1/+1
2006-09-17Fix git-am safety checksJunio C Hamano1-4/+19
2006-09-17Fix duplicate xmalloc in builtin-addLiu Yubao1-1/+0
2006-09-13http-fetch: fix alternates handling.v1.4.2.1Junio C Hamano1-5/+34
2006-08-21builtin-mv: readability patchJohannes Schindelin1-60/+44
2006-08-21git-mv: fix off-by-one errorJohannes Schindelin1-1/+1
2006-08-21git-mv: special case destination "."Johannes Schindelin2-1/+8
2006-08-16[PATCH] git-mv: add more path normalizationJohannes Schindelin1-9/+16
2006-08-15finish_connect(): thinkofixJunio C Hamano1-8/+3
2006-08-15git-mv: succeed even if source is a prefix of destinationJohannes Schindelin2-1/+8
2006-08-15Solaris does not support C99 format strings before version 10Dennis Stosberg1-0/+2
2006-08-13sample commit-msg hook: no silent exit on duplicate Signed-off-by linesLuben Tuikov1-1/+5
2006-08-13Fix regex pattern in commit-msgLuben Tuikov1-1/+1
2006-08-12GIT 1.4.2v1.4.2Junio C Hamano1-1/+1
2006-08-12Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano1-26/+121
2006-08-12t/t4013: fix futzing with the version string.Junio C Hamano1-2/+4
2006-08-12Better error message when we are unable to lock the index fileJunio C Hamano11-32/+20
2006-08-12git-am: give better diagnostics when the patch does not apply during --3wayJunio C Hamano1-9/+19
2006-08-12Merge branch 'rj/header'Junio C Hamano1-0/+1
2006-08-11git-svn: split the path from the url correctly with limited permsEric Wong1-14/+11
2006-08-11git-sh-setup: do not use repo-config to test the git directoryJunio C Hamano1-8/+3
2006-08-11git-svn: bugfix: allow SVN:: lib users to track the root of the repositoryEric Wong1-1/+4
2006-08-11git-svn: correctly kill keyword expansion without munging EOLsEric Wong1-41/+4
2006-08-11drop length argument of has_extensionRene Scharfe8-10/+11
2006-08-10Merge branch 'rn/push-dav'Junio C Hamano1-1/+1
2006-08-10Add Documentation/howto/setup-git-server-over-http.txtRutger Nijlunsing1-0/+256
2006-08-10git-verify-pack: no need to count errorsRene Scharfe1-3/+3
2006-08-10git-verify-pack: buffer overrun paranoiaRene Scharfe1-0/+9
2006-08-10git-verify-pack: free pack after use and a cleanupRene Scharfe1-3/+8
2006-08-10git-verify-pack: get rid of while loopRene Scharfe1-16/+16
2006-08-10git-verify-pack: insist on .idx extensionRene Scharfe1-6/+5
2006-08-10git-verify-pack: more careful path handlingRene Scharfe1-7/+9
2006-08-10git-verify-pack: show usage when no pack was specifiedRene Scharfe1-0/+6
2006-08-10Add has_extension()Rene Scharfe8-8/+14
2006-08-10builtin-apply: remove unused incrementJunio C Hamano1-3/+1
2006-08-10Fix git-diff A...BJunio C Hamano1-0/+1
2006-08-10combine-diff: use colorJunio C Hamano1-16/+34
2006-08-09http-push: Make WebDAV work with (broken?) default apache2 WebDAV moduleRutger Nijlunsing1-1/+1
2006-08-09git-apply: applying a patch to make a symlink shorter.Junio C Hamano2-0/+60
2006-08-09allow diff.renamelimit to be set regardless of -M/-Cv1.4.2-rc4Junio C Hamano1-3/+0
2006-08-09make --find-copies-harder imply -CJunio C Hamano1-3/+4
2006-08-09find_unique_abbrev() with len=0 should not abbreviateJunio C Hamano1-1/+1
2006-08-09check return value from diff_setup_done()Junio C Hamano2-2/+4
2006-08-09Fix tutorial-2.htmlJunio C Hamano1-0/+1
2006-08-08Documentation: git-status takes the same options as git-commitJunio C Hamano1-1/+5
2006-08-08Update git-init-db(1) and documentation of core.sharedRepositoryJonas Fonseca2-19/+41
2006-08-08git-push: allow pushing from subdirectoriesJeff King1-1/+1
2006-08-08GIT-VERSION-GEN: adjust for ancient gitJunio C Hamano1-1/+9
2006-08-08builtin-mv: fix use of uninitialized memory.Junio C Hamano1-1/+2
2006-08-08debugging: XMALLOC_POISONJunio C Hamano1-0/+3
2006-08-07annotate: Fix bug when parsing merges with differing real and logical parents.Ryan Anderson1-6/+122
2006-08-07log-tree: show_log() should respect the setting of diffopt->line_terminationRyan Anderson1-1/+1
2006-08-07handle https:// protocol in git-cloneMichael Krelin1-1/+1
2006-08-06Fix "grep -w"Junio C Hamano2-10/+110
2006-08-05Makefile: Cygwin does not seem to need NO_STRLCPYJunio C Hamano1-1/+0
2006-08-05commit walkers: setup_ident() to record correct committer in ref-log.Ramsay Jones3-0/+3
2006-08-04Allow config file to specify Signed-off-by identity in format-patch.Ramsay Jones1-1/+1
2006-08-04Merge branch 'jc/c99'Junio C Hamano1-0/+1
2006-08-04Fix crash when GIT_DIR is invalidJohannes Schindelin1-1/+1
2006-08-04git-tar-tree: fix minor memory leakRene Scharfe1-2/+4
2006-08-04Document rev-list's option --mergeUwe Zeisberger1-0/+5
2006-08-03Further clean-up: usage() vs die()Junio C Hamano4-5/+5
2006-08-03Replace some calls to die(usage_str) with usage(usage_str).Ramsay Allan Jones5-7/+7
2006-08-03Fixup command names in some usage strings.Ramsay Allan Jones5-5/+5
2006-08-03GIT 1.4.2-rc3v1.4.2-rc3Junio C Hamano1-1/+1
2006-08-03Documentation/git.txt: link git-svn and git-instaweb from the main page.Junio C Hamano1-0/+6
2006-08-03Merge branch 'jc/sideband'Junio C Hamano1-1/+3
2006-08-03sideband: do not use color, just say "remote:"Junio C Hamano1-4/+3
2006-08-03Show both blob names from "git diff blob1 blob2"Junio C Hamano1-1/+1
2006-08-03diff.c: do not use pathname comparison to tell renamesJunio C Hamano3-6/+4
2006-08-03Add a couple of subdirectory tests.Junio C Hamano2-0/+136
2006-08-03read-tree: shadowed variable fix.Junio C Hamano1-1/+1
2006-08-03fixed variable declaration in gitkMichael1-1/+1
2006-08-03Fix "git diff blob1 blob2" showing the diff in reverse.Junio C Hamano1-4/+1
2006-08-02Cygwin needs NO_C99_FORMAT???Junio C Hamano1-0/+1
2006-08-02git-grep: document --and, --or, --not, ( and )Matthias Lederhofer1-3/+17
2006-08-02use declarations from builtin.h for builtin commandsMatthias Kestenholz2-2/+4
2006-08-02Make git-repo-config a builtinMatthias Kestenholz4-4/+8
2006-08-02Make git-prune-packed a builtinMatthias Kestenholz4-6/+6
2006-08-02git-annotate: remove extraneous debugging lineJeff King1-1/+0
2006-08-02Documentation: convert uses of git-link macro to gitlinkJeff King2-4/+4
2006-08-02git-push: remove obsolete git-push.shJeff King1-87/+0
2006-08-02git-push: allow -f as an alias for --forceJeff King2-3/+3
2006-08-02Fix header breakage with _XOPEN_SOURCE.Ramsay Allan Jones1-0/+1
2006-08-02Remove cmd_usage() routine and re-organize the help/usage code.Ramsay Allan Jones4-42/+33
2006-08-02Fix header breakage due to redefining PATH_MAX.Ramsay Allan Jones1-4/+1
2006-08-02Add NO_C99_FORMAT to support older compilers.Ramsay Allan Jones3-6/+35
2006-08-02New tests and en-passant modifications to mktag.Ramsay Allan Jones2-17/+245
2006-08-02Fix installation of templates on ancient systems.Ramsay Allan Jones2-8/+6
2006-08-02Fix annotate test script; notice when git-annotate fails.Ramsay Allan Jones1-1/+2
2006-08-02Ensure git-clone exits with error if perl script fails.Ramsay Allan Jones1-2/+3
2006-08-01fetch/clone: mark messages from remote side stand out.Junio C Hamano1-0/+3
2006-07-31Merge branch 'rs/rebase'Junio C Hamano1-9/+6
2006-07-31Merge branch 'ml/pager'Junio C Hamano7-7/+20
2006-07-31Merge branch 'jc/checkout'Junio C Hamano1-0/+4
2006-07-31pager: config variable pager.colorMatthias Lederhofer5-1/+12
2006-07-31Builtins: control the use of pager from the command table.Junio C Hamano2-6/+8
2006-07-31Fix up some fallout from "setup_git_directory()" cleanupsLinus Torvalds1-8/+7
2006-07-31Fix double "close()" in ce_compare_dataLinus Torvalds1-1/+1
2006-07-31git-checkout: allow "checkout HEAD -- path"Junio C Hamano1-0/+4
2006-07-31rebase: Make the fast-fowarding message more user-friendly by using branch na...Robert Shearman1-1/+1
2006-07-31rebase: Fix the detection of fast-forwarding of the current branch to upstream.Robert Shearman1-8/+5
2006-07-30tar-tree: illustrate an obscure feature betterJohannes Schindelin1-0/+5
2006-07-30git.c: allow alias expansion without a git directoryMatthias Lederhofer1-40/+36
2006-07-30setup_git_directory_gently: do not barf when GIT_DIR is given.Matthias Lederhofer1-0/+4
2006-07-30Build on Debian GNU/kFreeBSDGerrit Pape1-0/+3
2006-07-30Merge branch 'lt/web'Junio C Hamano1-2/+75
2006-07-30Merge branch '__/setup-n-mv'Junio C Hamano40-156/+142
2006-07-30Merge branch 'js/mv'Junio C Hamano11-340/+522
2006-07-30Merge branch 'jn/make'Junio C Hamano5-0/+225
2006-07-29Merge branch 'lt/setup' into __/setup-n-mvJunio C Hamano60-326/+585
2006-07-29Call setup_git_directory() much earlierLinus Torvalds35-144/+128
2006-07-28Call setup_git_directory() earlyLinus Torvalds12-22/+25
2006-07-28Display an error from update-ref if target ref name is invalid.Shawn Pearce2-0/+17
2006-07-28Fix http-fetchJohannes Schindelin1-3/+3
2006-07-28Merge branch 'pb/multi-fetch'Junio C Hamano7-72/+162
2006-07-28Merge branch 'lt/web'Junio C Hamano1-28/+55
2006-07-28Merge branch 'js/cvs'Junio C Hamano1-4/+4
2006-07-28Merge branch 'js/alias-p'Junio C Hamano3-46/+81
2006-07-28Merge branch 'jc/diff'Junio C Hamano1-1/+9
2006-07-28t4103: fix binary patch application test.Junio C Hamano1-2/+2
2006-07-28git-apply -R: binary patches are irreversible for now.Junio C Hamano1-0/+6
2006-07-28Teach git-apply about '-R'Johannes Schindelin2-12/+77
2006-07-28Makefile: ssh-pull.o depends on ssh-fetch.cJohannes Schindelin1-0/+2
2006-07-27log and diff family: honor config even from subdirectoriesJunio C Hamano5-7/+11
2006-07-27git-reset: detect update-ref error and report it.Junio C Hamano1-1/+4
2006-07-27lost-found: use fsck-objects --fullJunio C Hamano1-1/+1
2006-07-27Teach git-http-fetch the --stdin switchPetr Baudis2-17/+36
2006-07-27Teach git-local-fetch the --stdin switchPetr Baudis4-10/+74
2006-07-27Make pull() support fetching multiple targets at oncePetr Baudis5-37/+49
2006-07-27Make pull() take some implicit data as explicit argumentsPetr Baudis5-17/+12
2006-07-27mailinfo: accept >From in message headerMichael S. Tsirkin1-1/+1
2006-07-27Remove -d from *-fetch usage stringsPetr Baudis3-4/+4
2006-07-27daemon: documentation for --reuseaddr, --detach and --pid-fileMatthias Lederhofer2-2/+13
2006-07-26cvsserver: imitate git-update-ref when committingJohannes Schindelin1-4/+4
2006-07-26instaweb: Be more clear if httpd or the browser failJohannes Schindelin1-2/+7
2006-07-26builtin git-mv: support moving directoriesJohannes Schindelin2-5/+86
2006-07-26Make git-mv a builtinJohannes Schindelin8-295/+269
2006-07-26Extract helper bits from c-merge-recursive workJohannes Schindelin4-45/+172
2006-07-26Merge branch 'pb/configure'Junio C Hamano3-11/+13
2006-07-26git-cvsserver: support multiline commit messagesJohannes Schindelin1-3/+6
2006-07-26t7001: add test for git-mv dir1 dir2/Johannes Schindelin1-0/+15
2006-07-26gitweb: fix two warningsJohannes Schindelin1-2/+2
2006-07-26git-instaweb: respect bindir from MakefileJohannes Schindelin1-1/+1
2006-07-26git-instaweb: some Apache have mod_cgi builtinJohannes Schindelin1-1/+3
2006-07-26t4112: simplify the test and remove unneeded working tree file.Junio C Hamano1-26/+2
2006-07-26Extend testing git-mv for renaming of subdirectoriesJosef Weidendorfer1-0/+21
2006-07-25git wrapper: add --git-dir=<path> and --bare optionsJohannes Schindelin3-47/+58
2006-07-25Allow an alias to start with "-p"Johannes Schindelin1-6/+30
2006-07-25cvsserver: avoid warning about active db handlesv1.4.2-rc2Johannes Schindelin1-14/+56
2006-07-25cvsserver: suppress warningsJohannes Schindelin1-1/+1
2006-07-25Substitute xmalloc()+memset(0) with xcalloc().Peter Eriksen3-6/+3
2006-07-25gitweb: escape tag commentsDaniel Drake1-1/+1
2006-07-25Merge branch 'jc/clone-bind-failure'Junio C Hamano2-4/+11
2006-07-25Merge branch 'jt/format-patch'Junio C Hamano4-1/+63
2006-07-25Merge branch 'ew/apply'Junio C Hamano2-14/+163
2006-07-24Merge branch 'jc/read-tree'Junio C Hamano1-2/+2
2006-07-24upload-pack: fix timeout in create_pack_filev1.4.1.1Matthias Lederhofer1-0/+2
2006-07-24gitweb.cgi: git_blame2: slight optimization reading the blame linesLuben Tuikov1-14/+5
2006-07-24gitweb.cgi: Centralize printing of the page pathLuben Tuikov1-20/+21
2006-07-24gitweb.cgi: git_blame2: Revision blocks now have alternating colorsLuben Tuikov1-4/+11
2006-07-24gitweb.cgi: Show "raw" head of project link even when $hash is not definedLuben Tuikov1-0/+3
2006-07-24gitweb.cgi: git_blame2: Allow back-trekking through commitsLuben Tuikov1-1/+7
2006-07-24gitweb.cgi: git_blame2: an alternative simple working git blameLuben Tuikov1-1/+70
2006-07-24gitweb.cgi: Include direct link to "raw" files from "history"Luben Tuikov1-6/+29
2006-07-24gitweb.cgi: Teach git_history() to read hash from $hash_baseLuben Tuikov1-13/+13
2006-07-24Merge branch 'lt/objformat'Junio C Hamano5-8/+111
2006-07-24Trivial path optimization testAlex Riesen1-0/+19
2006-07-24Always reset the color _before_ printing out the newlineJohannes Schindelin1-1/+1
2006-07-24upload-pack: fix timeout in create_pack_fileMatthias Lederhofer1-0/+2
2006-07-24Defaulting fetch to origin when set in the repo-configSanti Béjar1-1/+2
2006-07-24Colorize 'commit' lines in log uiJeff King3-18/+26
2006-07-23git-am: Don't accept an mbox on stdin of we already have a .dotest directoryLukas Sandström1-2/+4
2006-07-23show-branch: Fix another performance problem.Alexandre Julliard1-0/+2
2006-07-23pack-objects: check pack.window for default window sizeJeff King2-1/+16
2006-07-23Disable linking with Fink or DarwinPorts.Shawn Pearce1-8/+22
2006-07-23git.el: Put the git customize group in the 'tools' parent group.Alexandre Julliard1-1/+2
2006-07-23git.el: Try to reuse an existing buffer when running git-status.Alexandre Julliard1-1/+23
2006-07-23git.el: Prepend a slash to the file name when adding to .gitignore.Alexandre Julliard1-1/+1
2006-07-23git.el: Run git-rerere on commits if the rr-cache directory exists.Alexandre Julliard1-0/+2
2006-07-23git-svn: fix fetching new directories copies when using SVN:: libsEric Wong1-7/+16
2006-07-23tar-tree: add the "tar.umask" config optionWilly Tarreau3-4/+43
2006-07-23Fix t4114 on cygwinJohannes Schindelin1-1/+1
2006-07-23cvsexportcommit - add -a (add author line) flag, cleanup warningsMartin Langhoff2-14/+44
2006-07-17unpack-objects: remove stale and confusing commentJunio C Hamano1-5/+0
2006-07-17git-fetch: fix --keep vs --thinJunio C Hamano1-1/+2
2006-07-17git-diff A...B to (usually) mean "git-diff `git-merge-base A B` B"Junio C Hamano1-1/+9
2006-07-17Merge branch 'sp/reflog'v1.4.2-rc1Junio C Hamano6-11/+33
2006-07-17apply: handle type-changing patch correctly.Junio C Hamano1-5/+24
2006-07-16apply: split out removal and creation into different phases.Junio C Hamano1-7/+17
2006-07-16apply: check D/F conflicts more carefully.Junio C Hamano1-3/+18
2006-07-16checkout -f failed to check out a file if an existing directory interfered.Junio C Hamano1-2/+2
2006-07-16typechange tests for git apply (currently failing)Eric Wong1-0/+105
2006-07-16git-svn: don't check for migrations/upgrades on commit-diffEric Wong1-1/+1
2006-07-16show-branch: fix performance problem.Junio C Hamano1-4/+5
2006-07-14builtin-log: typefix for recent format-patch changes.Junio C Hamano1-3/+6
2006-07-14Set datarootdir in config.mak.inPavel Roskin1-0/+1
2006-07-14Quote all calls to GIT_CONF_APPEND_LINEPavel Roskin1-12/+12
2006-07-14Add option to set initial In-Reply-To/ReferencesJosh Triplett2-0/+16
2006-07-14Add option to enable threading headersJosh Triplett2-9/+22