summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Strbuf API extensions and fixes.Pierre Habouzit2007-09-1014-34/+58
* Merge branch 'master' into ph/strbufJunio C Hamano2007-09-1025-54/+272
|\
| * Merge branch 'rs/archive'Junio C Hamano2007-09-1013-23/+197
| |\
| | * archive - leakfix for format_subst()Junio C Hamano2007-09-101-0/+1
| | * Define NO_MEMMEM on Darwin as it lacks the functionShawn O. Pearce2007-09-091-0/+1
| | * archive: rename attribute specfile to export-substRené Scharfe2007-09-063-19/+19
| | * archive: specfile syntax change: "$Format:%PLCHLDR$" instead of just "%PLCHLD...René Scharfe2007-09-063-8/+53
| | * add memmem()René Scharfe2007-09-063-0/+46
| | * Remove unused function convert_sha1_file()René Scharfe2007-09-032-16/+0
| | * archive: specfile support (--pretty=format: in archive files)René Scharfe2007-09-036-3/+98
| | * Export format_commit_message()Ren,bi(B Scharfe2007-09-032-4/+6
| * | Merge branch 'sp/maint-no-thin'Junio C Hamano2007-09-104-11/+24
| |\ \
| | * | Make --no-thin the default in git-push to save server resourcesShawn O. Pearce2007-09-101-1/+1
| | * | fix doc for --compression argument to pack-objectsNicolas Pitre2007-09-091-6/+2
| | * | git-tag -s must fail if gpg cannot sign the tag.Carlos Rica2007-09-092-4/+21
| * | | Merge branch 'maint'Junio C Hamano2007-09-096-16/+40
| |\ \ \ | | |/ /
| | * | git-svn: understand grafts when doing dcommitEric Wong2007-09-091-8/+3
| | * | git-diff: don't squelch the new SHA1 in submodule diffsSven Verdoolaege2007-09-092-4/+21
| | * | git-svn: fix "Malformed network data" with svn:// serversEric Wong2007-09-071-1/+13
| | * | (cvs|svn)import: Ask git-tag to overwrite old tags.Michael Smith2007-09-072-2/+2
| | * | Documentation / grammer nitMike Ralphson2007-09-071-1/+1
| * | | git-rebase: fix -C optionJ. Bruce Fields2007-09-071-1/+0
| * | | git-rebase: support --whitespace=<option>J. Bruce Fields2007-09-072-3/+11
* | | | Use strbuf API in cache-tree.cPierre Habouzit2007-09-061-37/+22
* | | | Use strbuf API in buitin-rerere.cPierre Habouzit2007-09-061-38/+18
* | | | Use strbuf API in apply, blame, commit-tree and diffPierre Habouzit2007-09-064-108/+44
* | | | mktree: Simplify write_tree() using strbuf APIPierre Habouzit2007-09-061-15/+8
* | | | fast-import: Use strbuf API, and simplify cmd_data()Pierre Habouzit2007-09-061-17/+13
* | | | Simplify strbuf uses in archive-tar.c using strbuf APIPierre Habouzit2007-09-061-49/+16
* | | | Rework strbuf API and semantics.Pierre Habouzit2007-09-065-28/+180
|/ / /
* | | Merge branch 'master' of git://repo.or.cz/git/git-p4Junio C Hamano2007-09-061-130/+212
|\ \ \
| * | | git-p4: Added support for automatically importing newly appearing perforce br...Simon Hausmann2007-09-031-2/+74
| * | | git-p4: Cleanup; moved the (duplicated) code for turning a branch into a git ...Simon Hausmann2007-09-031-17/+11
| * | | git-p4: Cleanup; moved the code for the initial #head or revision import into...Simon Hausmann2007-09-031-42/+45
| * | | git-p4: Cleanup; Turn self.revision into a function local variable (it's not ...Simon Hausmann2007-09-031-9/+9
| * | | git-p4: Cleanup; moved the code to import a list of p4 changes using fast-imp...Simon Hausmann2007-09-031-69/+71
| * | | git-p4: Cleanup; moved the code for getting a sorted list of p4 changes for a...Simon Hausmann2007-09-031-9/+14
| * | | git-p4: After submission to p4 always synchronize from p4 again (into refs/re...Simon Hausmann2007-09-031-2/+9
| * | | git-p4: Always call 'p4 sync ...' before submitting to Perforce.Simon Hausmann2007-09-031-3/+2
* | | | Merge branch 'maint'Junio C Hamano2007-09-056-4/+73
|\ \ \ \ | | |/ / | |/| |
| * | | Include a git-push example for creating a remote branchShawn O. Pearce2007-09-051-0/+6
| * | | Cleanup unnecessary file modifications in t1400-update-refShawn O. Pearce2007-09-051-2/+0
| * | | Makefile: Add cache-tree.h to the headers listDmitry V. Levin2007-09-051-1/+1
| * | | Don't allow contrib/workdir/git-new-workdir to trash existing dirsShawn O. Pearce2007-09-051-0/+6
| * | | git-apply: do not read past the end of bufferJunio C Hamano2007-09-052-1/+60
* | | | Merge branch 'ds/sendmail'Junio C Hamano2007-09-052-27/+109
|\ \ \ \
| * | | | send-email: Add support for SSL and SMTP-AUTHDouglas Stockwell2007-09-032-27/+109
| | |_|/ | |/| |
* | | | Function for updating refs.Carlos Rica2007-09-055-29/+46
|/ / /
* | | Start 1.5.4 cycleJunio C Hamano2007-09-033-2/+16
|/ /
* | GIT 1.5.3.1: obsolete git-p4 in RPM spec file.v1.5.3.1Junio C Hamano2007-09-035-3/+17