Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | packed_object_info_detail(): do not return a string | Junio C Hamano | 2011-05-16 | 1 | -2/+2 |
*---. | Merge branches 'jc/convert', 'jc/bigfile' and 'jc/replacing' into jc/streaming | Junio C Hamano | 2011-05-15 | 3 | -4/+8 |
|\ \ \ | |||||
| | | * | read_sha1_file(): get rid of read_sha1_file_repl() madness | Junio C Hamano | 2011-05-15 | 1 | -2/+2 |
| | |/ | |/| | |||||
| | * | index_fd(): turn write_object and format_check arguments into one flag | Junio C Hamano | 2011-05-09 | 2 | -2/+6 |
* | | | Merge branch 'maint' | Junio C Hamano | 2011-05-14 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | add, merge, diff: do not use strcasecmp to compare config variable names | Jonathan Nieder | 2011-05-14 | 1 | -2/+2 |
| * | | | Merge branch 'js/blame-parsename' into maint | Junio C Hamano | 2011-05-13 | 1 | -1/+1 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'bf/commit-template-no-cleanup' | Junio C Hamano | 2011-05-13 | 1 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Do not strip empty lines / trailing spaces from a commit message template | Boris Faure | 2011-05-11 | 1 | -1/+3 |
| |/ / / / | |||||
| * | | | | Merge branch 'jc/pack-objects-bigfile' into maint | Junio C Hamano | 2011-05-04 | 1 | -2/+6 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'mg/reflog-with-options' into maint | Junio C Hamano | 2011-05-04 | 1 | -13/+17 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge branch 'rr/rerere-libify-clear-gc' | Junio C Hamano | 2011-05-13 | 1 | -75/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rerere: libify rerere_clear() and rerere_gc() | Junio C Hamano | 2011-05-08 | 1 | -75/+2 |
* | | | | | | | | Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' | Junio C Hamano | 2011-05-13 | 1 | -0/+5 |
* | | | | | | | | Merge branch 'jc/fix-add-u-unmerged' | Junio C Hamano | 2011-05-13 | 1 | -22/+23 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix "add -u" that sometimes fails to resolve unmerged paths | Junio C Hamano | 2011-04-23 | 1 | -22/+23 |
* | | | | | | | | | Merge branch 'cn/log-parse-opt' | Junio C Hamano | 2011-05-13 | 1 | -30/+44 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | log: convert to parse-options | Carlos Martín Nieto | 2011-04-14 | 1 | -30/+43 |
* | | | | | | | | | | Merge branch 'jc/maint-branch-mergeoptions' | Junio C Hamano | 2011-05-11 | 1 | -15/+26 |
* | | | | | | | | | | Merge branch 'jc/maint-add-p-overlapping-hunks' | Junio C Hamano | 2011-05-11 | 1 | -3/+6 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
| * | | | | | | | | | "add -p": work-around an old laziness that does not coalesce hunks | Junio C Hamano | 2011-04-29 | 1 | -3/+6 |
* | | | | | | | | | | Merge branch 'js/blame-parsename' | Junio C Hamano | 2011-05-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| * | | | | | | | | | blame: tolerate bogus e-mail addresses a bit better | Josh Stone | 2011-04-29 | 1 | -1/+1 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'nd/struct-pathspec' | Junio C Hamano | 2011-05-06 | 5 | -17/+26 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | pathspec: rename per-item field has_wildcard to use_wildcard | Junio C Hamano | 2011-04-05 | 2 | -2/+3 |
| * | | | | | | | | | Improve tree_entry_interesting() handling code | Nguyễn Thái Ngọc Duy | 2011-03-25 | 1 | -6/+6 |
| * | | | | | | | | | Convert read_tree{,_recursive} to support struct pathspec | Nguyễn Thái Ngọc Duy | 2011-03-25 | 4 | -11/+19 |
* | | | | | | | | | | Merge branch 'mg/rev-list-count-cherry' | Junio C Hamano | 2011-05-04 | 1 | -2/+8 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | rev-list --count: separate count for --cherry-mark | Michael J Gruber | 2011-04-26 | 1 | -2/+8 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'vr/merge-base-doc' | Junio C Hamano | 2011-05-04 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Documentation: update to git-merge-base --octopus | Vincent van Ravesteijn | 2011-04-15 | 1 | -1/+2 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'jc/index-update-if-able' into maint | Junio C Hamano | 2011-04-03 | 2 | -13/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'lt/default-abbrev' into maint | Junio C Hamano | 2011-04-03 | 1 | -1/+5 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'mm/maint-log-n-with-diff-filtering' into maint | Junio C Hamano | 2011-04-03 | 1 | -1/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'lp/config-vername-check' into maint | Junio C Hamano | 2011-04-03 | 1 | -7/+20 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-apply-report-offset' into maint | Junio C Hamano | 2011-04-01 | 1 | -2/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-apply-no-double-patch' into maint | Junio C Hamano | 2011-04-01 | 1 | -1/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge "checkout ambiguous ref bugfix" into maint | Junio C Hamano | 2011-04-01 | 1 | -10/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/notes-ui-updates' | Junio C Hamano | 2011-05-02 | 1 | -10/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | notes: make expand_notes_ref globally accessible | Jeff King | 2011-03-29 | 1 | -10/+0 |
* | | | | | | | | | | | | | | | | | Merge branch 'ab/i18n-fixup' | Junio C Hamano | 2011-05-02 | 4 | -20/+32 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | i18n: mark init-db messages for translation | Ævar Arnfjörð Bjarmason | 2011-04-12 | 1 | -5/+5 |
| * | | | | | | | | | | | | | | | | | i18n: mark checkout plural warning for translation | Ævar Arnfjörð Bjarmason | 2011-04-12 | 1 | -3/+15 |
| * | | | | | | | | | | | | | | | | | i18n: mark checkout --detach messages for translation | Ævar Arnfjörð Bjarmason | 2011-04-12 | 1 | -3/+3 |
| * | | | | | | | | | | | | | | | | | i18n: mark clone nonexistent repository message for translation | Ævar Arnfjörð Bjarmason | 2011-04-12 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | i18n: mark merge CHERRY_PICK_HEAD messages for translation | Ævar Arnfjörð Bjarmason | 2011-04-12 | 1 | -3/+3 |
| * | | | | | | | | | | | | | | | | | i18n: mark merge "upstream" messages for translation | Ævar Arnfjörð Bjarmason | 2011-04-12 | 1 | -4/+4 |
| * | | | | | | | | | | | | | | | | | i18n: mark merge "Could not read from" message for translation | Ævar Arnfjörð Bjarmason | 2011-04-12 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'jh/notes-add-ui' | Junio C Hamano | 2011-05-02 | 1 | -3/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | Make "git notes add" more user-friendly when there are existing notes | Johan Herland | 2011-03-30 | 1 | -3/+17 |