summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rg/no-gecos-in-pwent'Junio C Hamano2011-05-262-1/+10
|\
| * ident: add NO_GECOS_IN_PWENT for systems without pw_gecos in struct passwdRafael Gieschke2011-05-192-1/+10
* | Merge branch 'jk/fetch-mark-complete-optimization'Junio C Hamano2011-05-261-2/+4
|\ \
| * | fetch: avoid repeated commits in mark_completeJeff King2011-05-191-2/+4
* | | Merge branch 'jn/gitweb-js'Junio C Hamano2011-05-2611-241/+1023
|\ \ \
| * | | gitweb: Make JavaScript ability to adjust timezones configurableJakub Narebski2011-05-241-8/+31
| * | | gitweb.js: Add UI for selecting common timezone to display datesJohn 'Warthog9' Hawley2011-05-244-16/+345
| * | | gitweb: JavaScript ability to adjust time based on timezoneJohn 'Warthog9' Hawley2011-05-244-3/+84
| * | | gitweb: Unify the way long timestamp is displayedJakub Narebski2011-05-241-5/+3
| * | | gitweb: Refactor generating of long dates into format_timestamp_htmlJakub Narebski2011-05-241-23/+22
| * | | gitweb.js: Provide getElementsByClassName method (if it not exists)Jakub Narebski2011-05-241-0/+51
| * | | gitweb.js: Introduce code to handle cookies from JavaScriptJakub Narebski2011-05-242-0/+115
| * | | gitweb.js: Extract and improve datetime handlingJakub Narebski2011-05-243-51/+162
| * | | gitweb.js: Provide default values for padding in padLeftStr and padLeftJakub Narebski2011-05-241-3/+11
| * | | gitweb.js: Update and improve comments in JavaScript filesJakub Narebski2011-05-242-15/+19
| * | | gitweb: Split JavaScript for maintability, combining on buildJakub Narebski2011-05-246-206/+269
* | | | Merge branch 'jn/ctags-more'Junio C Hamano2011-05-264-46/+152
|\ \ \ \
| * | | | gitweb: Optional grouping of projects by categorySebastien Cevey2011-04-294-3/+90
| * | | | gitweb: Modularized git_get_project_description to be more genericSebastien Cevey2011-04-291-8/+16
| * | | | gitweb: Split git_project_list_body in two functionsSebastien Cevey2011-04-291-39/+50
* | | | | Merge branch 'jc/require-work-tree-exists'Junio C Hamano2011-05-262-3/+15
|\ \ \ \ \
| * | | | | require-work-tree wants more than what its name saysJunio C Hamano2011-05-242-3/+15
* | | | | | Sync with 1.7.5.3Junio C Hamano2011-05-263-105/+36
|\ \ \ \ \ \
| * | | | | | Git 1.7.5.3v1.7.5.3Junio C Hamano2011-05-264-3/+36
| * | | | | | Merge branch 'maint-1.7.4' into maintJunio C Hamano2011-05-260-0/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'jk/git-connection-deadlock-fix' into maint-1.7.4Junio C Hamano2011-05-264-14/+67
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into maint-1.7.4Junio C Hamano2011-05-261-2/+7
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'jk/maint-upload-pack-shallow' into maint-1.7.4Junio C Hamano2011-05-261-12/+11
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Merge branch 'jm/maint-diff-words-with-sbe' into maintJunio C Hamano2011-05-262-2/+36
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'kk/maint-prefix-in-config-mak' into maintJunio C Hamano2011-05-261-9/+9
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/diff-uiconfig-doc' into maintJunio C Hamano2011-05-262-12/+30
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ft/gitweb-tar-with-gzip-n' into maintJunio C Hamano2011-05-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ss/doc-svn' into maintJunio C Hamano2011-05-261-9/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/format-patch-doc' into maintJunio C Hamano2011-05-264-195/+229
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-pathspec-stdin-and-cmdline' into maintJunio C Hamano2011-05-262-52/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/cherry-pick-root-with-resolve' into maintJunio C Hamano2011-05-263-7/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rg/copy-gecos-username' into maintJunio C Hamano2011-05-261-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'fc/completion-zsh' into maintJunio C Hamano2011-05-261-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/git-connection-deadlock-fix' into maintJunio C Hamano2011-05-264-14/+67
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into maintJunio C Hamano2011-05-261-2/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'svn-fe-maint' of git://repo.or.cz/git/jrn into maintJunio C Hamano2011-05-261-104/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | Revert "t0081 (line-buffer): add buffering tests"Jonathan Nieder2011-03-301-104/+2
* | | | | | | | | | | | | | | | | | | | | compat/fnmatch/fnmatch.c: give a fall-back definition for NULLJunio C Hamano2011-05-261-0/+4
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/bigfile'Junio C Hamano2011-05-257-31/+164
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Bigfile: teach "git add" to send a large file straight to a packJunio C Hamano2011-05-132-1/+110
| * | | | | | | | | | | | | | | | | | | | | index_fd(): split into two helper functionsJunio C Hamano2011-05-091-11/+31
| * | | | | | | | | | | | | | | | | | | | | index_fd(): turn write_object and format_check arguments into one flagJunio C Hamano2011-05-096-23/+27
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/log-abbrev-commit-config'Junio C Hamano2011-05-256-9/+85
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Add log.abbrevCommit config variableJay Soffian2011-05-186-8/+84
| * | | | | | | | | | | | | | | | | | | | | | "git log -h": typofix misspelled 'suppress'Jay Soffian2011-05-181-1/+1