summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2008-05-232-23/+29
|\
| * gitk: Fix bug introduced by "gitk: Fix "wrong # coordinates" error on reload"Paul Mackerras2008-05-221-1/+3
| * gitk: Fix bug where current row number display stops workingPaul Mackerras2008-05-201-23/+23
| * gitk: Move es.po where it belongsMichele Ballabio2008-05-191-0/+0
| * gitk: Fix "wrong # coordinates" error on reloadPaul Mackerras2008-05-191-0/+4
* | Merge branch 'pb/push'Junio C Hamano2008-05-236-35/+116
|\ \
| * | add special "matching refs" refspecPaolo Bonzini2008-05-046-35/+116
* | | Merge branch 'bc/repack'Junio C Hamano2008-05-237-34/+154
|\ \ \
| * | | Documentation/git-repack.txt: document new -A behaviourChris Frey2008-05-161-1/+13
| * | | let pack-objects do the writing of unreachable objects as loose objectsNicolas Pitre2008-05-132-17/+45
| * | | add a force_object_loose() functionNicolas Pitre2008-05-132-13/+48
| * | | builtin-gc.c: deprecate --prune, it now really has no effectBrandon Casey2008-05-111-2/+1
| * | | git-gc: always use -A when manually repackingBrandon Casey2008-05-111-11/+2
| * | | repack: modify behavior of -A option to leave unreferenced objects unpackedBrandon Casey2008-05-112-5/+60
* | | | Merge branch 'sp/ignorecase'Junio C Hamano2008-05-232-1/+36
|\ \ \ \
| * | | | t0050: Fix merge test on case sensitive file systemsSteffen Prohaska2008-05-171-0/+2
| * | | | t0050: Add test for case insensitive addSteffen Prohaska2008-05-111-0/+10
| * | | | t0050: Set core.ignorecase case to activate case insensitivitySteffen Prohaska2008-05-111-0/+1
| * | | | t0050: Test autodetect core.ignorecaseSteffen Prohaska2008-05-111-0/+16
| * | | | git-init: autodetect core.ignorecaseDmitry Potapov2008-05-111-1/+7
| |/ / /
* | | | Merge branch 'maint'Junio C Hamano2008-05-234-11/+18
|\ \ \ \
| * \ \ \ Merge branch 'maint-1.5.4' into maintv1.5.5.2Junio C Hamano2008-05-231-6/+12
| |\ \ \ \
| | * | | | rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a refJohannes Sixt2008-05-231-6/+12
| * | | | | Add missing "short" alternative to --date in rev-list-options.txtHeikki Orsila2008-05-221-1/+1
| * | | | | git-show.txt: Not very stubby these days.Jon Loeliger2008-05-221-2/+0
| * | | | | Clarify repack -n documentationShawn O. Pearce2008-05-221-2/+5
* | | | | | Add log.date config variableHeikki Orsila2008-05-233-1/+18
* | | | | | Updated status to show 'Not currently on any branch' in redChris Parsons2008-05-223-5/+13
* | | | | | pull --rebase: exit early when the working directory is dirtyJohannes Schindelin2008-05-222-0/+23
* | | | | | gitweb: Convert string to internal form before chopping in chop_strAnders Waldenborg2008-05-221-0/+4
* | | | | | Merge branch 'maint'Junio C Hamano2008-05-212-3/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'maint-1.5.4' into maintJunio C Hamano2008-05-212-3/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | git-am: fix typo in usage messageJeff King2008-05-191-1/+1
| | * | | | doc/git-daemon: s/uploadarchive/uploadarch/Jeff King2008-05-191-2/+2
* | | | | | Merge branch 'ar/add-unreadable'Junio C Hamano2008-05-218-21/+114
|\ \ \ \ \ \
| * | | | | | Add a config option to ignore errors for git-addAlex Riesen2008-05-122-1/+31
| * | | | | | Add a test for git-add --ignore-errorsAlex Riesen2008-05-121-0/+22
| * | | | | | Add --ignore-errors to git-add to allow it to skip files with read errorsAlex Riesen2008-05-122-3/+15
| * | | | | | Extend interface of add_files_to_cache to allow ignore indexing errorsAlex Riesen2008-05-124-12/+37
| * | | | | | Make the exit code of add_file_to_index actually usefulAlex Riesen2008-05-124-9/+13
* | | | | | | Merge branch 'ds/branch-auto-rebase'Junio C Hamano2008-05-210-0/+0
|\ \ \ \ \ \ \
| * | | | | | | Allow tracking branches to set up rebase by default.Dustin Sallings2008-05-126-1/+294
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'sv/first-parent'Junio C Hamano2008-05-211-8/+6
|\ \ \ \ \ \ \
| * | | | | | | revision.c: really honor --first-parentLars Hjemli2008-05-121-4/+4
| * | | | | | | Simplify and fix --first-parent implementationStephen R. van den Berg2008-04-291-6/+4
* | | | | | | | Merge branch 'np/pack'Junio C Hamano2008-05-211-79/+120
|\ \ \ \ \ \ \ \
| * | | | | | | | pack-objects: fix early eviction for max depth delta objectsNicolas Pitre2008-05-031-1/+1
| * | | | | | | | pack-objects: allow for early delta deflatingNicolas Pitre2008-05-031-1/+36
| * | | | | | | | pack-objects: move compression code in a separate functionNicolas Pitre2008-05-031-24/+29
| * | | | | | | | pack-objects: clean up write_object() a bitNicolas Pitre2008-05-031-31/+33
View Lorry Controller Status