Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'hv/remote-end-hung-up' | Junio C Hamano | 2012-07-04 | 1 | -9/+7 |
|\ | |||||
| * | remove the impression of unexpectedness when access is denied | Heiko Voigt | 2012-06-19 | 1 | -9/+7 |
* | | Merge branch 'fc/git-prompt-script' | Junio C Hamano | 2012-06-28 | 3 | -13/+475 |
|\ \ | |||||
| * | | completion: respect $GIT_DIR | SZEDER Gábor | 2012-06-19 | 1 | -1/+9 |
| * | | completion: split __git_ps1 into a separate script | Felipe Contreras | 2012-05-22 | 1 | -1/+1 |
| * | | Merge branch 'fc/git-complete-helper' into fc/git-prompt-script | Junio C Hamano | 2012-05-22 | 7 | -41/+160 |
| |\ \ | |||||
| * | | | tests: add tests for the bash prompt functions in the completion script | SZEDER Gábor | 2012-05-09 | 1 | -0/+448 |
| * | | | tests: move code to run tests under bash into a helper library | SZEDER Gábor | 2012-05-09 | 2 | -13/+19 |
* | | | | Merge branch 'js/submodule-relative' | Junio C Hamano | 2012-06-28 | 2 | -4/+235 |
|\ \ \ \ | |||||
| * | | | | t7400: avoid path mangling issues | Johannes Sixt | 2012-06-14 | 1 | -3/+8 |
| * | | | | submodule: fix handling of superproject origin URLs like foo, ./foo and ./foo... | Jon Seymour | 2012-06-06 | 2 | -6/+6 |
| * | | | | submodule: fix sync handling of some relative superproject origin URLs | Jon Seymour | 2012-06-06 | 1 | -4/+4 |
| * | | | | submodule: document failure to handle relative superproject origin URLs | Jon Seymour | 2012-06-03 | 2 | -1/+123 |
| * | | | | submodule: additional regression tests for relative URLs | Jon Seymour | 2012-06-03 | 1 | -3/+107 |
* | | | | | Merge branch 'lk/more-helpful-status-hints' | Junio C Hamano | 2012-06-28 | 2 | -0/+745 |
|\ \ \ \ \ | |||||
| * | | | | | status: better advices when splitting a commit (during rebase -i) | Lucien Kong | 2012-06-14 | 1 | -0/+277 |
| * | | | | | status: don't suggest "git rm" or "git add" if not appropriate | Lucien Kong | 2012-06-14 | 2 | -6/+38 |
| * | | | | | t7512-status-help.sh: better advices for git status | Lucien Kong | 2012-06-14 | 1 | -0/+372 |
| * | | | | | wt-status.*: better advices for git status added | Lucien Kong | 2012-06-14 | 1 | -0/+64 |
* | | | | | | Merge branch 'lk/rebase-i-x' | Junio C Hamano | 2012-06-28 | 1 | -0/+117 |
|\ \ \ \ \ \ | |||||
| * | | | | | | rebase -i: teach "--exec <cmd>" | Lucien Kong | 2012-06-13 | 1 | -0/+117 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'nd/stream-pack-objects' | Junio C Hamano | 2012-06-28 | 1 | -0/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | pack-objects: use streaming interface for reading large loose blobs | Nguyễn Thái Ngọc Duy | 2012-05-29 | 1 | -0/+12 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'nd/stream-index-pack' | Junio C Hamano | 2012-06-28 | 2 | -0/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | index-pack: use streaming interface for collision test on large blobs | Nguyễn Thái Ngọc Duy | 2012-05-24 | 1 | -0/+5 |
| * | | | | | | index-pack: use streaming interface on large blobs (most of the time) | Nguyễn Thái Ngọc Duy | 2012-05-23 | 1 | -0/+5 |
* | | | | | | | Merge branch 'mm/verify-filename-fix' | Junio C Hamano | 2012-06-28 | 1 | -0/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | verify_filename(): ask the caller to chose the kind of diagnosis | Matthieu Moy | 2012-06-18 | 1 | -1/+1 |
| * | | | | | | | sha1_name: do not trigger detailed diagnosis for file arguments | Matthieu Moy | 2012-06-18 | 1 | -0/+11 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-06-22 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Documentation: Fix misspellings | Leila Muhtasib | 2012-06-22 | 2 | -3/+3 |
* | | | | | | | | | Merge branch 'jk/maint-t1304-setfacl' | Junio C Hamano | 2012-06-21 | 1 | -10/+9 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t1304: improve setfacl prerequisite setup | Jeff King | 2012-06-07 | 1 | -10/+9 |
* | | | | | | | | | | Merge branch 'jk/clone-local' | Junio C Hamano | 2012-06-21 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | clone: allow --no-local to turn off local optimizations | Jeff King | 2012-05-30 | 1 | -0/+10 |
* | | | | | | | | | | Merge branch 'as/diff-shortstat-ignore-binary' | Junio C Hamano | 2012-06-15 | 1 | -0/+12 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | diff: Only count lines in show_shortstats | Alexander Strasser | 2012-06-15 | 1 | -0/+12 |
* | | | | | | | | | | | Merge branch 'rj/gitweb-test-sans-date-parser' | Junio C Hamano | 2012-06-13 | 1 | -7/+14 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | gitweb: Skip 'modification times' tests when no date parser available | Ramsay Jones | 2012-06-12 | 1 | -7/+14 |
* | | | | | | | | | | | | Merge branch 'fc/git-complete-helper-fix' | Junio C Hamano | 2012-06-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | completion: put main git and gitk completion functions back into git namespace | SZEDER Gábor | 2012-06-13 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge branch 'jc/fmt-merge-msg-people' | Junio C Hamano | 2012-06-12 | 1 | -18/+18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | fmt-merge-msg: make attribution into comment lines | Junio C Hamano | 2012-06-06 | 1 | -18/+18 |
* | | | | | | | | | | | | | | Merge branch 'rr/maint-t3510-cascade-fix' | Junio C Hamano | 2012-06-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | t3510 (cherry-pick-sequence): add missing '&&' | Ramkumar Ramachandra | 2012-06-04 | 1 | -1/+1 |
* | | | | | | | | | | | | | | Merge branch 'ef/maint-rebase-error-message' | Junio C Hamano | 2012-06-01 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | rebase: report invalid commit correctly | Erik Faye-Lund | 2012-05-30 | 1 | -0/+5 |
* | | | | | | | | | | | | | | | Merge branch 'nh/empty-rebase' | Junio C Hamano | 2012-06-01 | 1 | -0/+30 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | cherry-pick: regression fix for empty commits | Junio C Hamano | 2012-05-29 | 1 | -0/+30 |
* | | | | | | | | | | | | | | | t5701: modernize style | Jeff King | 2012-05-29 | 1 | -53/+20 |