summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git-merge-one-file: fix longstanding stupid thinkoJunio C Hamano2008-03-182-2/+49
* Merge branch 'jc/makefile'Junio C Hamano2008-03-171-150/+276
|\
| * Makefile: flatten enumeration of headers, objects and programsJunio C Hamano2008-03-121-148/+276
| * Makefile: DIFF_OBJS is not special at all these daysJunio C Hamano2008-03-121-7/+5
* | Don't update unchanged merge entriesLinus Torvalds2008-03-162-3/+47
* | fast-import: Allow "reset" to delete a new branch without errorEyvind Bernhardsen2008-03-161-0/+2
* | t1000: use "test_must_fail git frotz", not "! git frotz"Junio C Hamano2008-03-161-18/+18
* | Update draft release notes for 1.5.5v1.5.5-rc0Junio C Hamano2008-03-161-9/+42
* | Resurrect git-rerere to contrib/examplesJunio C Hamano2008-03-161-0/+284
* | Merge branch 'maint'Junio C Hamano2008-03-162-1/+54
|\ \
| * | Start draft ReleaseNotes for 1.5.4.5Junio C Hamano2008-03-162-1/+54
| * | rebase -m: do not trigger pre-commit verificationJunio C Hamano2008-03-161-1/+1
* | | Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano2008-03-1512-2431/+3155
|\ \ \
| * | | git-gui: Improve directions regarding POT update in po/READMEJunio C Hamano2008-03-161-12/+50
| * | | git-gui: Update Japanese translationしらいしななこ2008-03-151-13/+9
| * | | git-gui: Adjusted Japanese translation to updated POTShawn O. Pearce2008-03-151-249/+277
| * | | git-gui: Update Japanese translationしらいしななこ2008-03-151-291/+266
| * | | git-gui: Don't translate the special Apple menuShawn O. Pearce2008-03-152-2/+2
| * | | git-gui: Updated Hungarian translation (e5fba18)Miklos Vajna2008-03-151-14/+9
| * | | git-gui: update russian translationAlex Riesen2008-03-151-27/+21
| * | | git-gui: remove spurious "fuzzy" attributes in po/it.poMichele Ballabio2008-03-151-2/+0
| * | | git-gui: updated Swedish translationPeter Karlsson2008-03-141-290/+375
| * | | git-gui: Regenerated po template and merged translations with itPeter Karlsson2008-03-148-1841/+2311
| * | | Update Hungarian translation. 100% completed.Miklos Vajna2008-03-131-38/+102
| * | | git-gui: update Italian translationMichele Ballabio2008-03-131-265/+346
* | | | Redo "add test_cmp function for test scripts"Junio C Hamano2008-03-152-2/+2
* | | | Merge branch 'jk/portable'Junio C Hamano2008-03-1570-202/+247
|\ \ \ \
| * | | | t6000lib: re-fix tr portabilityJeff King2008-03-141-4/+7
| * | | | t7505: use SHELL_PATH in hookJeff King2008-03-131-2/+3
| * | | | t9112: add missing #!/bin/sh headerJeff King2008-03-131-0/+2
| * | | | filter-branch: use $SHELL_PATH instead of 'sh'Jeff King2008-03-132-1/+2
| * | | | filter-branch: don't use xargs -0Jeff King2008-03-131-1/+1
| * | | | add NO_EXTERNAL_GREP build optionJeff King2008-03-132-2/+16
| * | | | t6000lib: tr portability fixJeff King2008-03-131-1/+4
| * | | | t4020: don't use grep -aJeff King2008-03-132-1/+2
| * | | | add test_cmp function for test scriptsJeff King2008-03-1340-115/+133
| * | | | remove use of "tail -n 1" and "tail -1"Jeff King2008-03-137-20/+20
| * | | | grep portability fix: don't use "-e" or "-q"Jeff King2008-03-139-43/+42
| * | | | more tr portability test script fixesJeff King2008-03-1310-17/+17
| * | | | t0050: perl portability fixJeff King2008-03-131-2/+2
| * | | | tr portability fixesJeff King2008-03-124-6/+9
| | |_|/ | |/| |
* | | | Merge branch 'py/submodule'Junio C Hamano2008-03-153-8/+386
|\ \ \ \
| * | | | git-submodule summary: fix that some "wc" flavors produce leading spacesJohannes Sixt2008-03-121-1/+1
| * | | | git-submodule summary: testPing Yin2008-03-111-0/+195
| * | | | git-submodule summary: documentationPing Yin2008-03-111-3/+16
| * | | | git-submodule summary: limit summary sizePing Yin2008-03-111-2/+19
| * | | | git-submodule summary: show commit summaryPing Yin2008-03-111-0/+102
| * | | | git-submodule summary: code frameworkPing Yin2008-03-111-5/+56
* | | | | Merge branch 'db/diff-to-fp'Junio C Hamano2008-03-153-155/+171
|\ \ \ \ \
| * | | | | wt-status.c: no need for dup() dance anymoreKristian Høgsberg2008-03-141-15/+2
View Lorry Controller Status