summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/maint-clean-nested-dir-safety'Junio C Hamano2009-08-166-5/+63
|\
| * clean: require double -f options to nuke nested git repository and work treeJunio C Hamano2009-07-296-5/+63
* | Merge branch 'jk/maint-merge-msg-fix'Junio C Hamano2009-08-164-11/+75
|\ \
| * | merge: indicate remote tracking branches in merge messageJeff King2009-08-093-1/+16
| * | merge: fix incorrect merge message for ambiguous tag/branchJeff King2009-08-093-11/+10
| * | add tests for merge message headingsJeff King2009-08-091-0/+50
* | | Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2009-08-161-7/+24
|\ \ \
| * | | gitk: Parse arbitrary commit-ish in SHA1 fieldThomas Rast2009-08-131-1/+6
| * | | gitk: Fix direction of symmetric difference in optimized modeThomas Rast2009-08-131-1/+1
| * | | gitk: New option to hide remote refsThomas Rast2009-08-131-3/+15
| * | | gitk: Do not hard-code "encoding" in attribute lookup functionsJohannes Sixt2009-08-131-2/+2
* | | | git-cvsimport: add support for cvs pserver password scrambling.Dirk Hoerner2009-08-141-1/+38
* | | | gitweb: Optimize git-favicon.pngBenjamin Kramer2009-08-142-0/+0
* | | | Merge branch 'jn/gitweb-blame' (early part)Junio C Hamano2009-08-142-26/+50
|\ \ \ \
| * | | | gitweb: Use light/dark for class names also in 'blame' viewJakub Narebski2009-07-252-8/+11
| * | | | gitweb: Add author initials in 'blame' view, a la "git gui blame"Jakub Narebski2009-07-251-0/+8
| * | | | gitweb: Mark commits with no "previous" in 'blame' viewJakub Narebski2009-07-252-2/+8
| * | | | gitweb: Use "previous" header of git-blame -p in 'blame' viewJakub Narebski2009-07-251-14/+15
| * | | | gitweb: Mark boundary commits in 'blame' viewJakub Narebski2009-07-252-2/+8
| * | | | gitweb: Make .error style genericJakub Narebski2009-07-251-1/+1
* | | | | svn: (cleanup) use predefined constant for rev_map_fmtEric Wong2009-08-121-1/+1
* | | | | svn: allow branches outside of refs/remotesAdam Brewster2009-08-126-54/+96
* | | | | svn: initial "master" points to trunk if possibleEric Wong2009-08-123-1/+42
* | | | | Merge branch 'maint'Junio C Hamano2009-08-1214-18/+117
|\ \ \ \ \
| * \ \ \ \ Merge branch 'maint-1.6.3' into maintJunio C Hamano2009-08-129-12/+12
| |\ \ \ \ \
| | * | | | | Change mentions of "git programs" to "git commands"Ori Avtalion2009-08-128-10/+10
| | * | | | | Documentation: merge: one <remote> is requiredPaul Bolle2009-08-121-1/+1
| | * | | | | help.c: give correct structure's size to memset()Johan Herland2009-08-121-1/+1
| * | | | | | push: point to 'git pull' and 'git push --force' in case of non-fast forwardMatthieu Moy2009-08-124-5/+103
| * | | | | | Documentation: add: <filepattern>... is optionalPaul Bolle2009-08-121-1/+1
* | | | | | | allow pull --rebase on branch yet to be bornJeff King2009-08-122-5/+24
* | | | | | | Merge branch 'maint'Junio C Hamano2009-08-103-5/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'maint-1.6.3' into maintJunio C Hamano2009-08-102-4/+4
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fix typos in git-remote.txt and git-symbolic-ref.txtŠtěpán Němec2009-08-102-4/+4
| * | | | | | git-instaweb: fix mod_perl detection for apache2Mark A Rada2009-08-091-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'jk/push-quiet'Junio C Hamano2009-08-105-1/+26
|\ \ \ \ \ \
| * | | | | | transport: don't show push status if --quiet is givenJeff King2009-08-051-1/+19
| * | | | | | transport: pass "quiet" flag to pack-objectsJeff King2009-08-053-0/+5
| * | | | | | push: add --quiet flagJeff King2009-08-052-0/+2
* | | | | | | Merge branch 'jc/maint-merge-recursive-fix'Junio C Hamano2009-08-102-3/+80
|\ \ \ \ \ \ \
| * | | | | | | merge-recursive: don't segfault while handling rename clashesJunio C Hamano2009-07-302-3/+80
* | | | | | | | Merge branch 'zf/maint-gitweb-acname'Junio C Hamano2009-08-101-3/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | gitweb: parse_commit_text encoding fixZoltán Füzesi2009-08-051-3/+2
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'ns/am-raw-email'Junio C Hamano2009-08-102-1/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | git-am: print fair error message when format detection failsNicolas Sebrecht2009-08-061-1/+5
| * | | | | | | | am: allow individual e-mail files as inputJunio C Hamano2009-08-062-0/+29
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'np/maint-limit-delta-cache'Junio C Hamano2009-08-102-4/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | don't let the delta cache grow unbounded in 'git repack'Nicolas Pitre2009-08-052-4/+12
* | | | | | | | | Merge branch 'jp/symlink-dirs'Junio C Hamano2009-08-104-1/+114
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t6035-merge-dir-to-symlink depends on SYMLINKS prerequisiteJohannes Sixt2009-08-091-0/+6