summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Teach notes code to properly preserve non-notes in the notes treeJohan Herland2010-02-134-51/+233
| * | | t3305: Verify that adding many notes with git-notes triggers increased fanoutJohan Herland2010-02-131-0/+50
| * | | t3301: Verify successful annotation of non-commitsJohan Herland2010-02-131-0/+17
| * | | Builtin-ify git-notesJohan Herland2010-02-137-40/+350
| * | | Refactor notes concatenation into a flexible interface for combining notesJohan Herland2010-02-132-60/+112
| * | | Notes API: Allow multiple concurrent notes trees with new struct notes_treeJohan Herland2010-02-133-66/+112
| * | | Notes API: write_notes_tree(): Store the notes tree in the databaseJohan Herland2010-02-132-3/+180
| * | | Notes API: for_each_note(): Traverse the entire notes tree with a callbackJohan Herland2010-02-132-0/+180
| * | | Notes API: get_note(): Return the note annotating the given objectJohan Herland2010-02-132-7/+15
| * | | Notes API: remove_note(): Remove note objects from the notes tree structureJohan Herland2010-02-132-1/+87
| * | | Notes API: add_note(): Add note objects to the internal notes tree structureJohan Herland2010-02-132-0/+15
| * | | Notes API: init_notes(): Initialize the notes tree from the given notes refJohan Herland2010-02-132-12/+38
| * | | Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRefJohan Herland2010-02-131-0/+48
| * | | Notes API: get_commit_notes() -> format_note() + remove the commit restrictionJohan Herland2010-02-133-22/+30
| * | | Minor cosmetic fixes to notes.cJohan Herland2010-02-131-5/+4
* | | | Merge branch 'maint'Junio C Hamano2010-03-136-14/+47
|\ \ \ \
| * | | | don't use default revision if a rev was specifiedDave Olszewski2010-03-132-2/+13
| * | | | for_each_recent_reflog_ent(): use strbuf, fix offset handlingRené Scharfe2010-03-131-10/+12
| * | | | t/Makefile: remove test artifacts upon "make clean"Junio C Hamano2010-03-131-0/+2
| * | | | blame: fix indent of line numbersRené Scharfe2010-03-132-2/+20
* | | | | Merge git://git.bogomips.org/git-svnJunio C Hamano2010-03-133-2/+4
|\ \ \ \ \
| * | | | | t9150,t9151: Add rewrite-root option to initTuomas Suutari2010-03-132-0/+2
| * | | | | git-svn: Fix merge detecting with rewrite-rootTuomas Suutari2010-03-131-2/+2
* | | | | | Merge branch 'maint'Junio C Hamano2010-03-121-12/+12
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | t9400: Use test_cmp when appropriateJunio C Hamano2010-03-111-12/+12
* | | | | Merge branch 'sd/init-template'Junio C Hamano2010-03-106-12/+67
|\ \ \ \ \
| * | | | | wrap-for-bin: do not export an empty GIT_TEMPLATE_DIRJunio C Hamano2010-03-021-2/+7
| * | | | | t/t0001-init.sh: add test for 'init with init.templatedir set'Steven Drake2010-02-252-1/+21
| * | | | | init: having keywords without value is not a global error.Steven Drake2010-02-251-2/+0
| * | | | | Add a "TEMPLATE DIRECTORY" section to git-init[1].Steven Drake2010-02-173-10/+26
| * | | | | Add `init.templatedir` configuration variable.Steven Drake2010-02-171-0/+16
| | |_|_|/ | |/| | |
* | | | | Merge branch 'sh/am-keep-cr'Junio C Hamano2010-03-106-10/+141
|\ \ \ \ \
| * | | | | git-am: Add tests for `--keep-cr`, `--no-keep-cr` and `am.keepcr`Stefan-W. Hahn2010-02-281-0/+96
| * | | | | git-am: Add am.keepcr and --no-keep-cr to override itStefan-W. Hahn2010-02-283-7/+26
| * | | | | git-am: Add command line parameter `--keep-cr` passing it to git-mailsplitStefan-W. Hahn2010-02-282-8/+21
| * | | | | documentation: 'git-mailsplit --keep-cr' is not hidden anymoreStefan-W. Hahn2010-02-282-2/+5
* | | | | | Merge branch 'cp/add-u-pathspec'Junio C Hamano2010-03-103-9/+39
|\ \ \ \ \ \
| * | | | | | test for add with non-existent pathspecChris Packham2010-02-162-0/+10
| * | | | | | git add -u: die on unmatched pathspecJunio C Hamano2010-02-161-9/+29
* | | | | | | Makefile: update check-docs targetJunio C Hamano2010-03-101-1/+2
* | | | | | | Merge branch 'lt/deepen-builtin-source'Junio C Hamano2010-03-1090-107/+107
|\ \ \ \ \ \ \
| * | | | | | | Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-2290-97/+97
* | | | | | | | Update draft release notes to 1.7.1Junio C Hamano2010-03-081-3/+21
* | | | | | | | Merge branch 'maint'Junio C Hamano2010-03-081-0/+34
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge accumulated fixes to prepare for 1.7.0.3Junio C Hamano2010-03-082-1/+35
| * | | | | | | Merge branch 'mw/maint-gcc-warns-unused-write' into maintJunio C Hamano2010-03-081-4/+6
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'fn/maint-mkdtemp-compat' into maintJunio C Hamano2010-03-081-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'gb/maint-submodule-env' into maintJunio C Hamano2010-03-088-33/+69
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'as/maint-expire' into maintJunio C Hamano2010-03-084-18/+86
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ml/maint-grep-doc' into maintJunio C Hamano2010-03-081-13/+17
| |\ \ \ \ \ \ \ \ \ \ \