Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | l10n: initial git.pot for 1.7.10 upcoming release | Jiang Xin | 2012-02-15 | 3 | -2/+3431 |
* | Update draft release notes to 1.7.10 | Junio C Hamano | 2012-02-10 | 1 | -1/+22 |
* | Merge branch 'js/add-e-submodule-fix' | Junio C Hamano | 2012-02-10 | 1 | -0/+1 |
|\ | |||||
| * | add -e: do not show difference in a submodule that is merely dirtyjs/add-e-submodule-fix | Johannes Schindelin | 2012-02-07 | 1 | -0/+1 |
* | | Merge branch 'jc/parse-date-raw' | Junio C Hamano | 2012-02-10 | 4 | -1/+60 |
|\ \ | |||||
| * | | parse_date(): '@' prefix forces git-timestampjc/parse-date-raw | Junio C Hamano | 2012-02-03 | 4 | -2/+32 |
| * | | parse_date(): allow ancient git-timestamp | Junio C Hamano | 2012-02-03 | 1 | -0/+29 |
* | | | Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' | Junio C Hamano | 2012-02-10 | 2 | -1/+15 |
|\ \ \ | |||||
| * | | | merge: do not create a signed tag merge under --ff-only optionjc/merge-ff-only-stronger-than-signed-merge | Junio C Hamano | 2012-02-05 | 2 | -1/+15 |
* | | | | Merge branch 'jc/branch-desc-typoavoidance' | Junio C Hamano | 2012-02-10 | 2 | -4/+52 |
|\ \ \ \ | |||||
| * | | | | branch --edit-description: protect against mistyped branch namejc/branch-desc-typoavoidance | Junio C Hamano | 2012-02-05 | 2 | -4/+52 |
* | | | | | Merge branch 'jn/rpm-spec' | Junio C Hamano | 2012-02-10 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | git.spec: Workaround localized messages not put in any RPMjn/rpm-spec | Jakub Narebski | 2012-02-03 | 1 | -0/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'jk/tests-write-script' | Junio C Hamano | 2012-02-10 | 2 | -6/+11 |
|\ \ \ \ \ | |||||
| * | | | | | t0300: use write_script helperjk/tests-write-script | Jeff King | 2012-02-03 | 1 | -6/+2 |
| | |/ / / | |/| | | | |||||
| * | | | | tests: add write_script helper function | Junio C Hamano | 2012-02-03 | 1 | -0/+9 |
| |/ / / | |||||
* | | | | Sync with maint | Junio C Hamano | 2012-02-10 | 2 | -36/+17 |
|\ \ \ \ | |||||
| * | | | | Update draft release notes to 1.7.9.1 | Junio C Hamano | 2012-02-10 | 1 | -0/+17 |
| * | | | | Merge branch 'jc/maint-request-pull-for-tag' into maint | Junio C Hamano | 2012-02-10 | 3 | -8/+4 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'tr/grep-l-with-decoration' into maint | Junio C Hamano | 2012-02-10 | 2 | -2/+25 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jl/submodule-re-add' into maint | Junio C Hamano | 2012-02-10 | 2 | -0/+9 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'da/maint-mergetool-twoway' into maint | Junio C Hamano | 2012-02-10 | 2 | -5/+35 |
| |\ \ \ \ \ \ \ | |||||
* | | | | | | | | | Update draft release notes to 1.7.10 | Junio C Hamano | 2012-02-07 | 1 | -1/+12 |
* | | | | | | | | | Merge branch 'jc/maint-request-pull-for-tag' | Junio C Hamano | 2012-02-07 | 3 | -8/+4 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| * | | | | | | | | request-pull: explicitly ask tags/$name to be pulledjc/maint-request-pull-for-tag | Junio C Hamano | 2012-01-31 | 3 | -8/+4 |
* | | | | | | | | | Merge branch 'bl/gitweb-project-filter' | Junio C Hamano | 2012-02-07 | 2 | -20/+95 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | gitweb: Make project search respect project_filter | Jakub Narebski | 2012-02-01 | 1 | -5/+13 |
| * | | | | | | | | | gitweb: improve usability of projects search form | Jakub Narebski | 2012-02-01 | 2 | -6/+28 |
| * | | | | | | | | | gitweb: place links to parent directories in page header | Bernhard R. Link | 2012-02-01 | 1 | -1/+4 |
| * | | | | | | | | | gitweb: show active project_filter in project_list page header | Bernhard R. Link | 2012-02-01 | 1 | -0/+14 |
| * | | | | | | | | | gitweb: limit links to alternate forms of project_list to active project_filter | Bernhard R. Link | 2012-02-01 | 1 | -2/+4 |
| * | | | | | | | | | gitweb: add project_filter to limit project list to a subdirectory | Bernhard R. Link | 2012-02-01 | 1 | -6/+25 |
| * | | | | | | | | | gitweb: prepare git_get_projects_list for use outside 'forks'. | Bernhard R. Link | 2012-02-01 | 1 | -1/+6 |
| * | | | | | | | | | gitweb: move hard coded .git suffix out of git_get_projects_list | Bernhard R. Link | 2012-02-01 | 1 | -4/+6 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jx/i18n-more-marking' | Junio C Hamano | 2012-02-07 | 2 | -14/+24 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | i18n: format_tracking_info "Your branch is behind" messagejx/i18n-more-marking | Jiang Xin | 2012-02-01 | 1 | -11/+21 |
| * | | | | | | | | | i18n: git-commit whence_s "merge/cherry-pick" message | Jiang Xin | 2012-02-01 | 1 | -3/+3 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'jn/svn-fe' | Junio C Hamano | 2012-02-07 | 28 | -1366/+1448 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | vcs-svn: suppress a -Wtype-limits warningjn/svn-fe | Jonathan Nieder | 2012-02-02 | 1 | -3/+3 |
| * | | | | | | | | | vcs-svn: allow import of > 4GiB files | Jonathan Nieder | 2012-02-02 | 3 | -14/+26 |
| * | | | | | | | | | vcs-svn: rename check_overflow arguments for clarity | Ramsay Jones | 2012-02-02 | 1 | -7/+7 |
| * | | | | | | | | | vcs-svn/svndiff.c: squelch false "unused" warning from gcc | Junio C Hamano | 2012-01-27 | 1 | -1/+1 |
| * | | | | | | | | | Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into jn/svn-fe | Junio C Hamano | 2012-01-27 | 28 | -1362/+1432 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | vcs-svn: reset first_commit_done in fast_export_init | Dmitry Ivankov | 2011-06-23 | 1 | -0/+1 |
| | * | | | | | | | | | Merge branch 'db/text-delta' into svn-fe | Jonathan Nieder | 2011-06-21 | 1 | -12/+0 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | vcs-svn: do not initialize report_buffer twice | Dmitry Ivankov | 2011-06-21 | 1 | -12/+0 |
| | * | | | | | | | | | | Merge branch 'db/text-delta' into svn-fe | Jonathan Nieder | 2011-06-15 | 5 | -14/+280 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | vcs-svn: avoid hangs from corrupt deltas | Jonathan Nieder | 2011-06-15 | 2 | -9/+46 |
| | | * | | | | | | | | | vcs-svn: guard against overflow when computing preimage length | Jonathan Nieder | 2011-06-15 | 1 | -1/+14 |
| | | * | | | | | | | | | Merge branch 'db/delta-applier' into db/text-delta | Jonathan Nieder | 2011-06-15 | 4 | -24/+37 |
| | | |\ \ \ \ \ \ \ \ \ |