Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'lf/read-blob-data-from-index' | Junio C Hamano | 2013-04-21 | 4 | -59/+39 |
|\ | |||||
| * | convert.c: remove duplicate code | Lukas Fleischer | 2013-04-17 | 1 | -25/+2 |
| * | read_blob_data_from_index(): optionally return the size of blob data | Lukas Fleischer | 2013-04-17 | 3 | -4/+6 |
| * | attr.c: extract read_index_data() as read_blob_data_from_index() | Lukas Fleischer | 2013-04-17 | 3 | -34/+35 |
* | | Update draft release notes to 1.8.3 | Junio C Hamano | 2013-04-19 | 1 | -1/+27 |
* | | Merge branch 'jk/a-thread-only-dies-once' | Junio C Hamano | 2013-04-19 | 3 | -6/+26 |
|\ \ | |||||
| * | | run-command: use thread-aware die_is_recursing routine | Jeff King | 2013-04-16 | 1 | -0/+11 |
| * | | usage: allow pluggable die-recursion checks | Jeff King | 2013-04-16 | 2 | -6/+15 |
| |/ | |||||
* | | Merge branch 'rt/commentchar-fmt-merge-msg' | Junio C Hamano | 2013-04-19 | 1 | -3/+3 |
|\ \ | |||||
| * | | t6200: avoid path mangling issue on Windows | Johannes Sixt | 2013-04-18 | 1 | -3/+3 |
* | | | Merge branch 'mv/sequencer-pick-error-diag' | Junio C Hamano | 2013-04-19 | 2 | -0/+24 |
|\ \ \ | |||||
| * | | | cherry-pick: make sure all input objects are commits | Miklos Vajna | 2013-04-11 | 2 | -0/+24 |
* | | | | Merge branch 'tr/copy-revisions-from-stdin' | Junio C Hamano | 2013-04-19 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | read_revisions_from_stdin: make copies for handle_revision_arg | Thomas Rast | 2013-04-16 | 1 | -1/+2 |
* | | | | | Merge branch 'jn/add-2.0-u-A-sans-pathspec' (early part) | Junio C Hamano | 2013-04-19 | 2 | -40/+95 |
|\ \ \ \ \ | |||||
| * | | | | | add -A: only show pathless 'add -A' warning when changes exist outside cwd | Jonathan Nieder | 2013-04-03 | 1 | -5/+16 |
| * | | | | | add -u: only show pathless 'add -u' warning when changes exist outside cwd | Jonathan Nieder | 2013-04-03 | 2 | -4/+38 |
| * | | | | | add: make warn_pathless_add() a no-op after first call | Jonathan Nieder | 2013-04-03 | 1 | -0/+5 |
| * | | | | | add: add a blank line at the end of pathless 'add [-u|-A]' warning | Matthieu Moy | 2013-04-03 | 1 | -1/+3 |
| * | | | | | add: make pathless 'add [-u|-A]' warning a file-global function | Jonathan Nieder | 2013-03-20 | 1 | -33/+36 |
* | | | | | | Merge branch 'ap/strbuf-humanize' | Junio C Hamano | 2013-04-19 | 6 | -40/+86 |
|\ \ \ \ \ \ | |||||
| * | | | | | | count-objects: add -H option to humanize sizes | Antoine Pelisse | 2013-04-10 | 2 | -12/+46 |
| * | | | | | | strbuf: create strbuf_humanise_bytes() to show byte sizes | Antoine Pelisse | 2013-04-10 | 4 | -28/+40 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'fc/branch-upstream-color' | Junio C Hamano | 2013-04-19 | 2 | -9/+30 |
|\ \ \ \ \ \ | |||||
| * | | | | | | branch: colour upstream branches | Felipe Contreras | 2013-04-15 | 2 | -9/+30 |
* | | | | | | | Merge branch 'mv/ssl-ftp-curl' | Junio C Hamano | 2013-04-19 | 3 | -0/+27 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Support FTP-over-SSL/TLS for regular FTP | Modestas Vainius | 2013-04-12 | 3 | -0/+27 |
* | | | | | | | | Update draft release notes to 1.8.3 | Junio C Hamano | 2013-04-18 | 1 | -1/+25 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2013-04-18 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | remote-hg: fix commit messages | Felipe Contreras | 2013-04-17 | 1 | -1/+2 |
* | | | | | | | | | Merge branch 'jk/test-trash' | Junio C Hamano | 2013-04-18 | 1 | -9/+9 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t/test-lib.sh: drop "$test" variable | Jeff King | 2013-04-14 | 1 | -5/+5 |
| * | | | | | | | | | t/test-lib.sh: fix TRASH_DIRECTORY handling | John Keeping | 2013-04-14 | 1 | -4/+4 |
* | | | | | | | | | | Merge branch 'th/t9903-symlinked-workdir' | Junio C Hamano | 2013-04-18 | 1 | -5/+5 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t9903: Don't fail when run from path accessed through symlink | Torstein Hegge | 2013-04-11 | 1 | -5/+5 |
* | | | | | | | | | | | Merge branch 'jk/merge-tree-added-identically' | Junio C Hamano | 2013-04-18 | 2 | -23/+13 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | merge-tree: don't print entries that match "local" | John Keeping | 2013-04-08 | 2 | -23/+13 |
* | | | | | | | | | | | | Merge branch 'jk/http-dumb-namespaces' | Junio C Hamano | 2013-04-18 | 3 | -4/+63 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | http-backend: respect GIT_NAMESPACE with dumb clients | John Koleszar | 2013-04-09 | 3 | -4/+63 |
* | | | | | | | | | | | | | Merge branch 'rs/empty-archive' | Junio C Hamano | 2013-04-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | t5004: fix issue with empty archive test and bsdtar | René Scharfe | 2013-04-10 | 1 | -1/+1 |
* | | | | | | | | | | | | | | Merge branch 'fc/send-email-annotate' | Junio C Hamano | 2013-04-18 | 7 | -90/+136 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | rebase-am: explicitly disable cover-letter | Felipe Contreras | 2013-04-14 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | format-patch: trivial cleanups | Felipe Contreras | 2013-04-07 | 1 | -36/+35 |
| * | | | | | | | | | | | | | | format-patch: add format.coverLetter configuration variable | Felipe Contreras | 2013-04-07 | 4 | -8/+62 |
| * | | | | | | | | | | | | | | log: update to OPT_BOOL | Felipe Contreras | 2013-04-07 | 1 | -7/+7 |
| * | | | | | | | | | | | | | | format-patch: refactor branch name calculation | Felipe Contreras | 2013-04-07 | 1 | -17/+16 |
| * | | | | | | | | | | | | | | format-patch: improve head calculation for cover-letter | Felipe Contreras | 2013-04-07 | 2 | -18/+9 |
| * | | | | | | | | | | | | | | send-email: make annotate configurable | Felipe Contreras | 2013-04-07 | 3 | -5/+8 |
* | | | | | | | | | | | | | | | Merge branch 'jc/push-2.0-default-to-simple' (early part) | Junio C Hamano | 2013-04-18 | 12 | -16/+24 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |