summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | Merge branch 'rt/commit-cleanup-config'Junio C Hamano2013-03-211-8/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | t7502: perform commits using alternate editor in a subshellBrandon Casey2013-02-231-8/+16
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/branch-error-cases'Junio C Hamano2013-03-212-0/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | branch: segfault fixes and validationNguyễn Thái Ngọc Duy2013-02-232-0/+48
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ap/maint-update-index-h-is-for-help'Junio C Hamano2013-03-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | update-index: allow "-h" to also display optionsAntoine Pelisse2013-02-231-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/perl-cat-blob'Junio C Hamano2013-03-211-10/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Git.pm: fix cat_blob crashes on large filesJoshua Clayton2013-02-221-10/+7
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'da/difftool-fixes'Junio C Hamano2013-03-212-200/+170
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | t7800: "defaults" is no longer a builtin tool nameDavid Aguilar2013-02-211-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | t7800: modernize testsDavid Aguilar2013-02-201-198/+168
| * | | | | | | | | | | | | | | | | | | | | | | | t7800: update copyright noticeDavid Aguilar2013-02-191-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | difftool: silence uninitialized variable warningDavid Aguilar2013-02-171-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ob/imap-send-ssl-verify'Junio C Hamano2013-03-211-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | imap-send: support Server Name Indication (RFC4366)Junio C Hamano2013-02-201-0/+11
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bc/commit-complete-lines-given-via-m-option'Junio C Hamano2013-03-213-15/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-commit.txt: rework the --cleanup sectionBrandon Casey2013-02-191-10/+19
| * | | | | | | | | | | | | | | | | | | | | | | | | | git-commit: only append a newline to -m mesg if necessaryBrandon Casey2013-02-192-2/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | t7502: demonstrate breakage with a commit message with trailing newlinesBrandon Casey2013-02-191-3/+11
| * | | | | | | | | | | | | | | | | | | | | | | | | | t/t7502: compare entire commit message with what was expectedBrandon Casey2013-02-191-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/count-garbage'Junio C Hamano2013-03-215-26/+162
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | count-objects: report how much disk space taken by garbage filesNguyễn Thái Ngọc Duy2013-02-152-6/+14
| * | | | | | | | | | | | | | | | | | | | | | | | | | | count-objects: report garbage files in pack directory tooNguyễn Thái Ngọc Duy2013-02-155-4/+124
| * | | | | | | | | | | | | | | | | | | | | | | | | | | sha1_file: reorder code in prepare_packed_git_one()Nguyễn Thái Ngọc Duy2013-02-131-16/+14
| * | | | | | | | | | | | | | | | | | | | | | | | | | | git-count-objects.txt: describe each line in -v outputNguyễn Thái Ngọc Duy2013-02-081-5/+15
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/fetch-raw-sha1'Junio C Hamano2013-03-2110-79/+194
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | fetch: fetch objects by their exact SHA-1 object namesJunio C Hamano2013-02-074-2/+67
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | upload-pack: optionally allow fetching from the tips of hidden refsJunio C Hamano2013-02-072-7/+26
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | fetch: use struct ref to represent refs to be fetchedJunio C Hamano2013-02-075-53/+89
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | parse_fetch_refspec(): clarify the codeflow a bitJunio C Hamano2013-02-071-17/+12
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/preallocate-hash'Junio C Hamano2013-03-213-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preallocate hash tables when the number of inserts are known in advanceNguyễn Thái Ngọc Duy2013-03-163-0/+10
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/index-pack-l10n-buf-overflow'Junio C Hamano2013-03-211-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | index-pack: fix buffer overflow caused by translationsNguyễn Thái Ngọc Duy2013-03-161-4/+5
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/document-status-u-tradeoff'Junio C Hamano2013-03-219-4/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | status: advise to consider use of -u when read_directory takes too longNguyễn Thái Ngọc Duy2013-03-168-0/+36
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git status: document trade-offs in choosing parameters to the -u optionJunio C Hamano2013-03-151-4/+10
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/shell-disable-interactive'Junio C Hamano2013-03-212-13/+82
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shell: new no-interactive-login command to print a custom messageJonathan Nieder2013-03-092-0/+33
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shell doc: emphasize purpose and security modelJonathan Nieder2013-03-091-13/+49
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-push-refspec-default-doc'Junio C Hamano2013-03-211-9/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-push: clarify the description of defaultsJunio C Hamano2013-03-081-9/+14
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first wave of topics for 1.8.3Junio C Hamano2013-03-191-0/+33
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/add-2.0-u-A-sans-pathspec' (early part)Junio C Hamano2013-03-191-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t2200: check that "add -u" limits itself to subdirectoryJeff King2013-03-141-0/+16
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'lf/bundle-verify-list-prereqs'Junio C Hamano2013-03-191-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bundle: Add colons to list headings in "verify"Lukas Fleischer2013-03-081-4/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bundle: Fix "verify" output if history is completeLukas Fleischer2013-03-071-1/+1
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/graph-c-expose-symbols-for-cgit'Junio C Hamano2013-03-192-30/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "graph.c: mark private file-scope symbols as static"John Keeping2013-03-032-30/+35