Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rr/die-on-missing-upstream' | Junio C Hamano | 2013-06-11 | 2 | -17/+22 |
|\ | |||||
| * | sha1_name: fix error message for @{<N>}, @{<date>} | Ramkumar Ramachandra | 2013-06-02 | 1 | -1/+10 |
| * | sha1_name: fix error message for @{u} | Ramkumar Ramachandra | 2013-05-22 | 2 | -16/+12 |
* | | Sync with 1.8.3.1 | Junio C Hamano | 2013-06-10 | 5 | -5/+24 |
|\ \ | |||||
| * | | Git 1.8.3.1v1.8.3.1 | Junio C Hamano | 2013-06-10 | 4 | -2/+22 |
| * | | mingw: make mingw_signal return the correct handler | Erik Faye-Lund | 2013-06-10 | 1 | -1/+3 |
| * | | Merge branch 'jn/config-ignore-inaccessible' into maint | Junio C Hamano | 2013-06-09 | 5 | -15/+22 |
| |\ \ | |||||
| * \ \ | Merge branch 'kb/status-ignored-optim-2' into maint | Junio C Hamano | 2013-06-09 | 2 | -0/+21 |
| |\ \ \ | |||||
| * | | | | submodule: remove redundant check for the_index.initialized | René Scharfe | 2013-06-09 | 1 | -3/+2 |
| * | | | | Document .git/modules | Fredrik Gustafsson | 2013-06-09 | 1 | -0/+3 |
* | | | | | Merge tag 'post183-for-junio' of http://github.com/msysgit/git | Junio C Hamano | 2013-06-07 | 4 | -2/+35 |
|\ \ \ \ \ | |||||
| * | | | | | Set the default help format to html for msys builds. | Pat Thoyts | 2013-06-04 | 1 | -0/+1 |
| * | | | | | Ensure the resource file is rebuilt when the version changes. | Pat Thoyts | 2013-06-04 | 1 | -1/+1 |
| * | | | | | Windows resource: handle dashes in the Git version gracefully | Johannes Schindelin | 2013-06-04 | 1 | -1/+1 |
| * | | | | | Provide a Windows version resource for the git executables. | Pat Thoyts | 2013-06-04 | 4 | -1/+32 |
| * | | | | | msysgit: Add the --large-address-aware linker directive to the makefile. | Pierre le Riche | 2013-06-04 | 1 | -0/+1 |
| * | | | | | Define NO_GETTEXT for Git for Windows | Johannes Schindelin | 2013-06-04 | 1 | -0/+1 |
| * | | | | | Makefile: Do not use OLD_ICONV on MINGW anymore | Sebastian Schuberth | 2013-06-04 | 1 | -1/+0 |
* | | | | | | Update draft release notes to 1.8.4 | Junio C Hamano | 2013-06-06 | 1 | -0/+23 |
* | | | | | | Merge branch 'rj/mingw-compat-st-mode-bits' | Junio C Hamano | 2013-06-06 | 1 | -1/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | path: Fix a sparse warning | Ramsay Jones | 2013-05-29 | 1 | -1/+3 |
* | | | | | | | Merge branch 'sb/archive-zip-double-assignment-fix' | Junio C Hamano | 2013-06-06 | 1 | -1/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | archive-zip:write_zip_entry: Remove second reset of size variable to zero. | Stefan Beller | 2013-05-29 | 1 | -1/+0 |
* | | | | | | | | Merge branch 'rr/push-head' | Junio C Hamano | 2013-06-06 | 1 | -7/+14 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | push: make push.default = current use resolved HEAD | Ramkumar Ramachandra | 2013-05-29 | 1 | -1/+1 |
| * | | | | | | | | push: fail early with detached HEAD and current | Ramkumar Ramachandra | 2013-05-29 | 1 | -0/+5 |
| * | | | | | | | | push: factor out the detached HEAD error message | Ramkumar Ramachandra | 2013-05-29 | 1 | -6/+8 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'ks/difftool-dir-diff-copy-fix' | Junio C Hamano | 2013-06-06 | 2 | -7/+21 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | difftool --dir-diff: allow changing any clean working tree file | Kenichi Saita | 2013-05-29 | 2 | -7/+21 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'fc/show-branch-in-rebase-am' | Junio C Hamano | 2013-06-06 | 2 | -1/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | prompt: fix for simple rebase | Felipe Contreras | 2013-05-29 | 2 | -1/+3 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'nd/clone-connectivity-shortcut' | Junio C Hamano | 2013-06-06 | 13 | -55/+192 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | clone: open a shortcut for connectivity check | Nguyễn Thái Ngọc Duy | 2013-05-28 | 9 | -15/+94 |
| * | | | | | | | | index-pack: remove dead code (it should never happen) | Nguyễn Thái Ngọc Duy | 2013-05-28 | 1 | -2/+1 |
| * | | | | | | | | fetch-pack: prepare updated shallow file before fetching the pack | Nguyễn Thái Ngọc Duy | 2013-05-28 | 5 | -38/+93 |
| * | | | | | | | | clone: let the user know when check_everything_connected is run | Nguyễn Thái Ngọc Duy | 2013-05-11 | 1 | -0/+4 |
* | | | | | | | | | Merge branch 'nd/prune-packed-dryrun-verbose' | Junio C Hamano | 2013-06-06 | 3 | -9/+11 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | prune-packed: avoid implying "1" is DRY_RUN in prune_packed_objects() | Nguyễn Thái Ngọc Duy | 2013-05-28 | 3 | -9/+11 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'fc/transport-helper-no-refspec' | Junio C Hamano | 2013-06-06 | 1 | -1/+12 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | transport-helper: check if the dry-run is supported | Felipe Contreras | 2013-05-21 | 1 | -0/+5 |
| * | | | | | | | | | transport-helper: barf when user tries old:new | Felipe Contreras | 2013-05-21 | 1 | -2/+4 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Update draft release notes to 1.8.4 | Junio C Hamano | 2013-06-05 | 1 | -2/+37 |
* | | | | | | | | | Merge branch 'rs/commit-m-no-edit' | Junio C Hamano | 2013-06-05 | 2 | -4/+23 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | commit: don't start editor if empty message is given with -m | René Scharfe | 2013-05-28 | 2 | -4/+23 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'fc/send-email-chainreplyto-warning' | Junio C Hamano | 2013-06-05 | 2 | -66/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | send-email: remove warning about unset chainreplyto | Felipe Contreras | 2013-05-28 | 2 | -66/+2 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'fc/cleanups' | Junio C Hamano | 2013-06-05 | 4 | -19/+11 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | test: rebase: fix --interactive test | Felipe Contreras | 2013-05-28 | 1 | -1/+1 |
| * | | | | | | | | | test: trivial cleanups | Felipe Contreras | 2013-05-28 | 2 | -16/+9 |
| * | | | | | | | | | remote: trivial style cleanup | Felipe Contreras | 2013-05-28 | 1 | -2/+1 |
| |/ / / / / / / / |