summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* userdiff: require explicitly allowing textconvJeff King2008-10-267-27/+17
* refactor userdiff textconv codeJeff King2008-10-262-16/+38
* add userdiff textconv testsJeff King2008-10-261-0/+118
* document the diff driver textconv featureJeff King2008-10-261-13/+53
* diff: add missing static declarationJeff King2008-10-261-1/+1
* submodule: fix some non-portable grep invocationsJeff King2008-10-221-2/+2
* git-remote: list branches in vertical listsJohannes Sixt2008-10-223-12/+17
* rm: loosen safety valve for empty filesJeff King2008-10-224-2/+17
* Merge branch 'jk/diff-convfilter'Junio C Hamano2008-10-216-247/+290
|\
| * diff: add filter for converting binary to textJeff King2008-10-183-2/+50
| * diff: introduce diff.<driver>.binaryJeff King2008-10-184-38/+45
| * diff: unify external diff and funcname parsing codeJeff King2008-10-184-224/+212
| * t4012: use test_cmp instead of cmpJeff King2008-10-181-2/+2
* | Merge branch 'js/maint-fetch-update-head'Junio C Hamano2008-10-217-5/+44
|\ \
| * | pull: allow "git pull origin $something:$current_branch" into an unborn branchJunio C Hamano2008-10-172-2/+14
| * | Fix fetch/pull when run without --update-head-okJohannes Schindelin2008-10-135-3/+30
* | | Merge branch 'jc/maint-co-track'Junio C Hamano2008-10-2112-29/+62
|\ \ \
| * | | Enhance hold_lock_file_for_{update,append}() APIJunio C Hamano2008-10-1911-23/+39
| * | | demonstrate breakage of detached checkout with symbolic link HEADJunio C Hamano2008-10-191-0/+12
| * | | Fix "checkout --track -b newbranch" on detached HEADJunio C Hamano2008-10-172-7/+11
* | | | Merge branch 'rs/alloc-ref'Junio C Hamano2008-10-217-43/+30
|\ \ \ \
| * | | | make alloc_ref_from_str() the new alloc_ref()René Scharfe2008-10-187-27/+18
| * | | | use alloc_ref_from_str() everywhereRené Scharfe2008-10-183-8/+4
| * | | | add alloc_ref_with_prefix()René Scharfe2008-10-181-16/+16
* | | | | Merge branch 'jk/fix-ls-files-other'Junio C Hamano2008-10-215-44/+39
|\ \ \ \ \
| * \ \ \ \ Merge branch 'jk/maint-ls-files-other' into jk/fix-ls-files-otherJunio C Hamano2008-10-175-44/+39
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | refactor handling of "other" files in ls-files and statusJeff King2008-10-175-44/+40
| | |/ / /
* | | | | Merge branch 'jc/maint-reset-remove-unmerged-new'Junio C Hamano2008-10-212-13/+78
|\ \ \ \ \
| * | | | | reset --hard/read-tree --reset -u: remove unmerged new pathsJunio C Hamano2008-10-182-13/+78
* | | | | | Merge branch 'maint'Junio C Hamano2008-10-213-12/+35
|\ \ \ \ \ \
| * | | | | | GIT 1.6.0.3v1.6.0.3Junio C Hamano2008-10-211-9/+6
| * | | | | | rehabilitate 'git index-pack' inside the object storeNicolas Pitre2008-10-212-3/+29
* | | | | | | Merge branch 'maint'Junio C Hamano2008-10-201-4/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix testcase failure when extended attributes are in useJunio C Hamano2008-10-191-4/+6
* | | | | | | workflows documentation: fix link to git-request-pull[1]Lee Marlow2008-10-201-1/+1
* | | | | | | bash completion: Add 'workflows' to 'git help'Lee Marlow2008-10-201-0/+1
* | | | | | | Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2008-10-205-1067/+1340
|\ \ \ \ \ \ \
| * | | | | | | gitk: Turn short SHA1 names into links tooPaul Mackerras2008-10-211-30/+77
| * | | | | | | gitk: Regenerate .po filesPaul Mackerras2008-10-185-966/+1037
| * | | | | | | gitk: New way of constructing menus that allows for Alt+letter acceleratorsPaul Mackerras2008-10-171-70/+98
| * | | | | | | gitk: Bind Key-Return to create on new branch dialogRichard Quirk2008-10-161-0/+1
| * | | | | | | gitk: Fix binding for <Return> in sha1 entry fieldPaul Mackerras2008-10-161-1/+1
| * | | | | | | gitk: Clean up file encoding code and add enable/disable optionPaul Mackerras2008-10-151-59/+92
| * | | | | | | gitk: Implement batch lookup and caching of encoding attrsAlexander Gavrilov2008-10-141-1/+34
| * | | | | | | gitk: Enhance file encoding supportAlexander Gavrilov2008-10-141-11/+63
| * | | | | | | gitk: Add untranslated error messages to translationChristian Stimming2008-09-211-9/+9
| * | | | | | | gitk: Fix a bug in collapsing deeply nested treesAlexander Gavrilov2008-09-211-1/+1
| * | | | | | | gitk: Use <Button-2> for context menus on OSXPaul Mackerras2008-09-211-5/+13
* | | | | | | | document "intent to add" option to git-addJeff King2008-10-201-2/+11
* | | | | | | | Merge branch 'sh/maint-rebase3'Junio C Hamano2008-10-192-2/+174
|\ \ \ \ \ \ \ \
View Lorry Controller Status