summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2006-12-06git-reset to remove "$GIT_DIR/MERGE_MSG"v1.4.4.2Junio C Hamano1-1/+2
2006-12-04unpack-trees: make sure "df_conflict_entry.name" is NUL terminated.Junio C Hamano1-3/+5
2006-12-04receive-pack: do not insist on fast-forward outside refs/heads/Junio C Hamano1-1/+2
2006-12-04git-mv: search more precisely for source directory in indexJohannes Schindelin2-4/+20
2006-12-02git-svn: avoid fetching files twice in the same revisionEric Wong1-5/+5
2006-11-29Document git-repo-config --bool/--int options.Andy Parkins1-0/+6
2006-11-29tutorial: talk about user.name early and don't start with commit -aJunio C Hamano1-5/+24
2006-11-29git-blame: fix rev parameter handling.Alex Riesen1-0/+1
2006-11-28git blame -C: fix output format tweaks when crossing file boundary.Junio C Hamano1-5/+5
2006-11-23Increase length of function name bufferAndy Parkins1-1/+1
2006-11-23git-svn: preserve uncommitted changes after dcommitEric Wong1-1/+1
2006-11-23git-svn: correctly handle revision 0 in SVN repositoriesEric Wong1-4/+10
2006-11-23git-svn: error out from dcommit on a parent-less commitEric Wong1-0/+7
2006-11-23archive-zip: don't use sizeof(struct ...)René Scharfe1-6/+18
2006-11-22GIT 1.4.4.1v1.4.4.1Junio C Hamano1-1/+1
2006-11-22trust-executable-bit: fix breakage for symlinksJunio C Hamano3-8/+18
2006-11-22Move --pretty options into Documentation/pretty-formats.txtChris Riddoch5-15/+83
2006-11-21Doc: Make comment about merging in tutorial.txt more clearPaolo Ciarrocchi1-1/+1
2006-11-21archive: use setvbuf() instead of setlinebuf()Michal Rokos1-1/+1
2006-11-21Teach SubmittingPatches about git-commit -sPaolo Ciarrocchi1-0/+3
2006-11-19do_for_each_ref: perform the same sanity check for leftovers.Junio C Hamano1-19/+19
2006-11-19git-fetch: follow lightweit tags as well.Junio C Hamano2-2/+19
2006-11-18Documentation: Correct alternates documentation, document http-alternatesPetr Baudis1-3/+14
2006-11-18Documentation: Define symref and update HEAD descriptionPetr Baudis2-5/+16
2006-11-18Document git-runstatusRene Scharfe3-1/+73
2006-11-18git-apply: slightly clean up bitfield usageRene Scharfe1-2/+5
2006-11-18sparse fix: Using plain integer as NULL pointerRene Scharfe1-1/+1
2006-11-18sparse fix: non-ANSI function declarationRene Scharfe2-2/+2
2006-11-18git-apply: Documentation typo fixPetr Baudis1-1/+1
2006-11-18Fix git-for-each-refs broken for tagsPetr Baudis1-2/+2
2006-11-16"git fmt-merge-msg" SIGSEGVLinus Torvalds1-0/+2
2006-11-16git-pull: allow pulling into an empty repositoryLinus Torvalds2-2/+47
2006-11-15convert-objects: set _XOPEN_SOURCE to 600Junio C Hamano1-1/+1
2006-11-15Run "git repack -a -d" once more at end, if there's 1MB or more of not-packed...Jim Meyering1-0/+10
2006-11-15gitweb: Put back shortlog instead of graphiclog in the project list.Alexandre Julliard1-1/+1
2006-11-15git-checkout: allow pathspec to recover lost working tree directoryJunio C Hamano1-1/+5
2006-11-15git-checkout: do not allow -f and -m at the same time.Junio C Hamano1-0/+5
2006-11-15Seek back to current filepos when mmap()ing with NO_MMAPJohannes Schindelin1-0/+6
2006-11-14GIT 1.4.4v1.4.4Junio C Hamano1-1/+1
2006-11-13Merge branch 'maint'Junio C Hamano8-23/+222
2006-11-13Rework cvsexportcommit to handle binary files for all cases.Robin Rosenberg4-20/+195
2006-11-13Catch errors when writing an index that contains invalid objects.Johannes Sixt2-0/+24
2006-11-13test-lib.sh: A command dying due to a signal is an unexpected failure.Johannes Sixt1-1/+1
2006-11-12git-update-index(1): fix use of quoting in section titleJonas Fonseca1-2/+2
2006-11-11GIT 1.4.4-rc2v1.4.4-rc2Junio C Hamano1-1/+1
2006-11-11Merge branch 'maint'Junio C Hamano1-28/+35
2006-11-11git-cvsserver: read from git with -z to get non-ASCII pathnames.v1.4.3.5Junio C Hamano1-28/+35
2006-11-11Merge branch 'maint'Junio C Hamano1-1/+1
2006-11-11path-list: fix path-list-insert return valueJunio C Hamano1-1/+1
2006-11-10git-annotate: fix -S on graft file with comments.Junio C Hamano1-1/+2
2006-11-10git-annotate: no need to exec blame; it is built-in now.Junio C Hamano1-2/+2
2006-11-09Merge branch 'maint'Junio C Hamano4-4/+102
2006-11-09git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.Robert Shearman1-1/+1
2006-11-09Documentation: move blame examplesJunio C Hamano1-4/+7
2006-11-09Merge branch 'maint'Junio C Hamano1-9/+12
2006-11-09git-svn: fix dcommit losing changes when out-of-date from svnEric Wong4-4/+102
2006-11-09git-svn: don't die on rebuild when --upgrade is specifiedEric Wong1-1/+1
2006-11-09git-svn: avoid printing filenames of files we're not trackingEric Wong1-5/+4
2006-11-09Nicer error messages in case saving an object to db goes wrongPetr Baudis1-9/+12
2006-11-09gitweb: fix unmatched div in commitdiffJunio C Hamano1-0/+2
2006-11-09gitweb: protect commit messages from controls.Junio C Hamano1-3/+2
2006-11-09gitweb: protect blob and diff output lines from controls.Junio C Hamano1-5/+6
2006-11-08git-pickaxe: retire pickaxeJunio C Hamano9-1281/+86
2006-11-08Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano1-0/+15
2006-11-08git-status: quote LF in its outputJunio C Hamano1-11/+53
2006-11-08gitweb: do not give blame link unconditionally in diff-tree viewJunio C Hamano1-10/+20
2006-11-08gitweb: New improved patchset viewJakub Narebski2-76/+173
2006-11-08gitweb: Use character or octal escape codes (and add span.cntrl) in esc_pathJakub Narebski1-1/+29
2006-11-08gitweb: Better git-unquoting and gitweb-quoting of pathnamesJakub Narebski2-19/+60
2006-11-07gitweb: minimally fix "fork" support.Junio C Hamano1-2/+20
2006-11-07gitweb: fix disabling of "forks"Junio C Hamano1-3/+5
2006-11-07GIT 1.4.3-rc1v1.4.4-rc1Junio C Hamano1-1/+1
2006-11-07Merge branch 'maint'Junio C Hamano1-2/+0
2006-11-07Merge branch 'jc/pickaxe'Junio C Hamano13-4/+2093
2006-11-07git-pickaxe: allow "-L <something>,+N"Junio C Hamano1-0/+19
2006-11-07git-pack-objects progress flag documentation and cleanupNicolas Pitre2-9/+27
2006-11-07remove an unneeded testTero Roponen1-2/+0
2006-11-07Merge branch 'jc/read-tree'Junio C Hamano5-60/+244
2006-11-07Merge branch 'np/index-pack'Junio C Hamano13-411/+824
2006-11-06Merge branch 'maint'Junio C Hamano4-17/+62
2006-11-06git-pickaxe: -L /regexp/,/regexp/Junio C Hamano1-13/+83
2006-11-06Documentation: Transplanting branch with git-rebase --ontoJakub Narebski1-8/+57
2006-11-06Document git-pack-refs and link it to git(7).Junio C Hamano2-0/+60
2006-11-06merge-recursive implicitely depends on trust_executable_bitAlex Riesen1-0/+1
2006-11-05adjust_shared_perm: chmod() only when needed.Junio C Hamano1-1/+1
2006-11-05Fix git-runstatus for repositories containing a file named HEADJeff King1-8/+3
2006-11-05Remove more sed invocations from within bash completion.Shawn O. Pearce1-7/+7
2006-11-05Support bash completion on symmetric difference operator.Shawn O. Pearce1-3/+8
2006-11-05Take --git-dir into consideration during bash completion.Shawn O. Pearce1-53/+70
2006-11-05Bash completion support for remotes in .git/config.Shawn O. Pearce1-5/+21
2006-11-05Only load .exe suffix'd completions on Cygwin.Shawn O. Pearce1-0/+2
2006-11-05Added missing completions for show-branch and merge-base.Shawn O. Pearce1-0/+4
2006-11-05git-pickaxe: optimize by avoiding repeated read_sha1_file().Junio C Hamano1-38/+62
2006-11-05git-blame: add internal statistics to count read blobs.Junio C Hamano1-0/+3
2006-11-05cherry is built-in, do not ship git-cherry.shJunio C Hamano3-91/+39
2006-11-04Merge branch 'maint'Junio C Hamano4-26/+15
2006-11-04Remove unsupported C99 style struct initializers in git-archive.v1.4.3.4Shawn O. Pearce2-13/+12
2006-11-04Remove SIMPLE_PROGRAMS and make git-daemon a normal program.Shawn O. Pearce1-12/+2
2006-11-04Use ULONG_MAX rather than implicit cast of -1.Shawn O. Pearce1-1/+1
2006-11-04git-svn: don't die on rebuild when --upgrade is specifiedEric Wong1-1/+1
2006-11-04git-svn: avoid printing filenames of files we're not trackingEric Wong1-5/+4
2006-11-04git-pickaxe: fix origin refcountingJunio C Hamano1-19/+42
2006-11-04Merge branch 'np/verbose-push'Junio C Hamano3-8/+13
2006-11-04Merge branch 'lt/push-config'Junio C Hamano2-4/+19
2006-11-04Added bash completion support for git-reset.Shawn O. Pearce1-0/+9
2006-11-04Added completion support for git-branch.exe.Shawn O. Pearce1-0/+1
2006-11-04Merge branch 'pb/web'Junio C Hamano1-82/+174
2006-11-04git-pickaxe: re-scan the blob after making progress with -CJunio C Hamano1-62/+103
2006-11-04git-pickaxe: re-scan the blob after making progress with -MJunio C Hamano1-9/+15
2006-11-04git-pickaxe: simplify Octopus merges furtherJunio C Hamano1-1/+11
2006-11-04git-pickaxe: rename detection optimizationJunio C Hamano3-1/+7
2006-11-04Merge branch 'maint'Junio C Hamano1-2/+6
2006-11-04apply: handle "traditional" creation/deletion diff correctly.Junio C Hamano1-2/+6
2006-11-04gitweb: Remove extra "/" in path names for git_get_project_listAneesh Kumar K.V1-0/+2
2006-11-04git.el: Include MERGE_MSG in the log-edit buffer even when not committing a m...Alexandre Julliard1-1/+2
2006-11-04git.el: Move point after the log message header when entering log-edit mode.Alexandre Julliard1-1/+2
2006-11-04git.el: Added a function to open the current file in another window.Alexandre Julliard1-0/+10
2006-11-04git.el: Added functions for moving to the next/prev unmerged file.Alexandre Julliard1-0/+28
2006-11-03remove .keep pack lock files when done with refs updateNicolas Pitre4-39/+116
2006-11-03have index-pack create .keep file more carefullyNicolas Pitre1-7/+10
2006-11-03improve fetch-pack's handling of kept packsNicolas Pitre5-100/+106
2006-11-03git-fetch can use both --thin and --keep with fetch-pack nowNicolas Pitre1-2/+2
2006-11-03Teach receive-pack how to keep pack files based on object count.Shawn Pearce4-21/+91
2006-11-03Allow pack header preprocessing before unpack-objects/index-pack.Nicolas Pitre2-0/+28
2006-11-03Merge branch 'master' into np/index-packJunio C Hamano64-722/+1893
2006-11-02gitweb: Better support for non-CSS aware web browsersJakub Narebski1-3/+8
2006-11-02gitweb: Output also empty patches in "commitdiff" viewJakub Narebski1-33/+26
2006-11-02Merge branch 'sp/keep-pack' into np/index-packJunio C Hamano24-342/+600
2006-11-02Merge branch 'maint'Junio C Hamano3-4/+4
2006-11-02gitweb: Use git-for-each-ref to generate list of heads and/or tagsJakub Narebski1-61/+92
2006-11-02for-each-ref: "creator" and "creatordate" fieldsJunio C Hamano1-0/+25
2006-11-02Add --global option to git-repo-config.Sean2-15/+29
2006-11-02pack-refs: Store the full name of the ref even when packing only tags.Alexandre Julliard1-3/+5
2006-11-02git-clone documentation didn't mention --origin as equivalent of -oAndy Parkins1-0/+1
2006-11-02Minor grammar fixes for git-diff-index.txtAndy Parkins1-2/+2
2006-11-02link_temp_to_file: call adjust_shared_perm() only when we created the directoryJohannes Schindelin1-2/+1
2006-11-02Remove uneccessarily similar printf() from print_ref_list() in builtin-branchAndy Parkins1-3/+5
2006-11-02git-pickaxe: work properly in a subdirectory.Jeff King1-4/+11
2006-11-01make git-push a bit more verboseNicolas Pitre3-8/+13
2006-11-01Merge branch 'maint'Junio C Hamano2-4/+5
2006-11-01pack-objects doesn't create random pack namesNicolas Pitre1-3/+2
2006-11-01branch: work in subdirectories.Junio C Hamano1-1/+1
2006-11-01gitweb: Use 's' regexp modifier to secure against filenames with LFJakub Narebski1-2/+2
2006-11-01gitweb: Secure against commit-ish/tree-ish with the same name as pathJakub Narebski1-14/+22
2006-11-01gitweb: esc_html() author in blameLuben Tuikov1-1/+1
2006-11-01Merge branch 'rs/cherry'Junio C Hamano7-26/+139
2006-11-01Merge branch 'jc/refs-and-fetch'Junio C Hamano1-4/+4
2006-11-01Merge branch 'lj/refs'Junio C Hamano45-536/+1475
2006-10-31git-svnimport: support for partial importsSasha Khapyorsky1-4/+25
2006-10-31link_temp_to_file: don't leave the path truncated on adjust_shared_perm failureJunio C Hamano1-1/+3
2006-10-31Introduce a new revision set operator <rev>^!Junio C Hamano3-3/+55
2006-10-31git-pickaxe: cache one already found path per commit.Junio C Hamano1-4/+20
2006-10-30git push: add verbose flag and allow overriding of default target repositoryLinus Torvalds1-1/+11
2006-10-30Allow '-' in config variable namesLinus Torvalds1-3/+8
2006-10-30Merge branch 'maint'Junio C Hamano5-11/+16
2006-10-30Move deny_non_fast_forwards handling completely into receive-pack.Shawn Pearce4-4/+16
2006-10-30Remove unused variable in receive-pack.Shawn Pearce1-5/+2
2006-10-30revision traversal: --unpacked does not limit commit list anymore.Junio C Hamano1-1/+1
2006-10-30Continue traversal when rev-list --unpacked finds a packed commit.Jan Harkes1-8/+6
2006-10-30Use memmove instead of memcpy for overlapping areasEdgar Toernig2-4/+4
2006-10-30Use memmove instead of memcpy for overlapping areasEdgar Toernig1-1/+1
2006-10-30git-pickaxe: split find_origin() into find_rename() and find_origin().Junio C Hamano1-25/+43
2006-10-30quote.c: ensure the same quoting across platforms.Junio C Hamano1-1/+1
2006-10-30Revert "send-pack --keep: do not explode into loose objects on the receiving ...Junio C Hamano4-48/+10
2006-10-30Surround "#define DEBUG 0" with "#ifndef DEBUG..#endif"Junio C Hamano2-0/+7
2006-10-30git-pickaxe: tighten sanity checks.Junio C Hamano1-5/+10
2006-10-29git-pickaxe: refcount origin correctly in find_copy_in_parent()Junio C Hamano1-0/+1
2006-10-29git-pickaxe: allow -Ln,m as well as -L n,mJunio C Hamano1-2/+8
2006-10-29missing small substitutionNicolas Pitre1-1/+1
2006-10-29git-pickaxe: WIP to refcount origin structure.Junio C Hamano1-21/+121
2006-10-29Teach git-index-pack how to keep a pack file.Shawn Pearce2-6/+61
2006-10-29Merge early part of branch 'np/index-pack' into sp/keep-packJunio C Hamano4-284/+436
2006-10-29Only repack active packs by skipping over kept packs.Shawn Pearce1-10/+17
2006-10-29Allow short pack names to git-pack-objects --unpacked=.Shawn Pearce1-1/+19
2006-10-29git-send-email: Read the default SMTP server from the GIT config fileSergey Vlasov2-3/+8
2006-10-29git-send-email: Document support for local sendmail instead of SMTP serverSergey Vlasov1-2/+5
2006-10-29Swap the porcelain and plumbing commands in the git man pageRobin Rosenberg1-182/+182
2006-10-29Mention that pull can work locally in the synopsisRobin Rosenberg2-2/+2
2006-10-29send-pack --keep: do not explode into loose objects on the receiving end.Junio C Hamano4-10/+48
2006-10-28gitweb: Add "next" link to commitdiff viewJakub Narebski1-4/+45
2006-10-28gitweb: Move git_get_last_activity subroutine earlierJakub Narebski1-18/+18
2006-10-28Documentation: fix git-format-patch mark-up and link it from git.txtJunio C Hamano2-2/+5
2006-10-28Documentation: Update information about <format> in git-for-each-refJakub Narebski1-1/+5
2006-10-28Bash completion support for aliasesDennis Stosberg1-2/+27
2006-10-27t6022: ignoring untracked files by merge-recursive when they do not matterJunio C Hamano1-23/+142
2006-10-27merge-recursive: adjust to loosened "working file clobbered" checkJunio C Hamano1-21/+20
2006-10-27merge-recursive: make a few functions static.Junio C Hamano1-12/+13
2006-10-27merge-recursive: use abbreviated commit object name.Junio C Hamano1-1/+1
2006-10-27merge: loosen overcautious "working file will be lost" check.Junio C Hamano3-4/+69
2006-10-27gitweb: Fix up bogus $stylesheet declarationsPetr Baudis1-6/+2
2006-10-27index-pack: minor fixes to comment and function nameNicolas Pitre1-12/+12
2006-10-27enhance clone and fetch -k experienceNicolas Pitre2-206/+15
2006-10-27tests: merge-recursive is usable without PythonJunio C Hamano5-28/+1
2006-10-27Merge branch 'maint'Junio C Hamano5-5/+41
2006-10-27gitweb: Check git base URLs before generating URL from itJakub Narebski1-1/+1
2006-10-27Documentation: add git in /etc/services.Christian Couder2-0/+14
2006-10-27Documentation: add upload-archive service to git-daemon.Christian Couder1-0/+5
2006-10-26git-cherry: document limit and add diagramRene Scharfe1-2/+17
2006-10-26Merge branch 'jc/reflog' into lj/refsJunio C Hamano3-20/+32
2006-10-26Merge branch 'jc/combined' into maintJunio C Hamano2-11/+53