summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rr/die-on-missing-upstream'Junio C Hamano2013-06-112-17/+22
|\
| * sha1_name: fix error message for @{<N>}, @{<date>}Ramkumar Ramachandra2013-06-021-1/+10
| * sha1_name: fix error message for @{u}Ramkumar Ramachandra2013-05-222-16/+12
* | Sync with 1.8.3.1Junio C Hamano2013-06-105-5/+24
|\ \
| * | Git 1.8.3.1v1.8.3.1Junio C Hamano2013-06-104-2/+22
| * | mingw: make mingw_signal return the correct handlerErik Faye-Lund2013-06-101-1/+3
| * | Merge branch 'jn/config-ignore-inaccessible' into maintJunio C Hamano2013-06-095-15/+22
| |\ \
| * \ \ Merge branch 'kb/status-ignored-optim-2' into maintJunio C Hamano2013-06-092-0/+21
| |\ \ \
| * | | | submodule: remove redundant check for the_index.initializedRené Scharfe2013-06-091-3/+2
| * | | | Document .git/modulesFredrik Gustafsson2013-06-091-0/+3
* | | | | Merge tag 'post183-for-junio' of http://github.com/msysgit/gitJunio C Hamano2013-06-074-2/+35
|\ \ \ \ \
| * | | | | Set the default help format to html for msys builds.Pat Thoyts2013-06-041-0/+1
| * | | | | Ensure the resource file is rebuilt when the version changes.Pat Thoyts2013-06-041-1/+1
| * | | | | Windows resource: handle dashes in the Git version gracefullyJohannes Schindelin2013-06-041-1/+1
| * | | | | Provide a Windows version resource for the git executables.Pat Thoyts2013-06-044-1/+32
| * | | | | msysgit: Add the --large-address-aware linker directive to the makefile.Pierre le Riche2013-06-041-0/+1
| * | | | | Define NO_GETTEXT for Git for WindowsJohannes Schindelin2013-06-041-0/+1
| * | | | | Makefile: Do not use OLD_ICONV on MINGW anymoreSebastian Schuberth2013-06-041-1/+0
* | | | | | Update draft release notes to 1.8.4Junio C Hamano2013-06-061-0/+23
* | | | | | Merge branch 'rj/mingw-compat-st-mode-bits'Junio C Hamano2013-06-061-1/+3
|\ \ \ \ \ \
| * | | | | | path: Fix a sparse warningRamsay Jones2013-05-291-1/+3
* | | | | | | Merge branch 'sb/archive-zip-double-assignment-fix'Junio C Hamano2013-06-061-1/+0
|\ \ \ \ \ \ \
| * | | | | | | archive-zip:write_zip_entry: Remove second reset of size variable to zero.Stefan Beller2013-05-291-1/+0
* | | | | | | | Merge branch 'rr/push-head'Junio C Hamano2013-06-061-7/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | push: make push.default = current use resolved HEADRamkumar Ramachandra2013-05-291-1/+1
| * | | | | | | | push: fail early with detached HEAD and currentRamkumar Ramachandra2013-05-291-0/+5
| * | | | | | | | push: factor out the detached HEAD error messageRamkumar Ramachandra2013-05-291-6/+8
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'ks/difftool-dir-diff-copy-fix'Junio C Hamano2013-06-062-7/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | difftool --dir-diff: allow changing any clean working tree fileKenichi Saita2013-05-292-7/+21
| |/ / / / / / /
* | | | | | | | Merge branch 'fc/show-branch-in-rebase-am'Junio C Hamano2013-06-062-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | prompt: fix for simple rebaseFelipe Contreras2013-05-292-1/+3
| |/ / / / / / /
* | | | | | | | Merge branch 'nd/clone-connectivity-shortcut'Junio C Hamano2013-06-0613-55/+192
|\ \ \ \ \ \ \ \
| * | | | | | | | clone: open a shortcut for connectivity checkNguyễn Thái Ngọc Duy2013-05-289-15/+94
| * | | | | | | | index-pack: remove dead code (it should never happen)Nguyễn Thái Ngọc Duy2013-05-281-2/+1
| * | | | | | | | fetch-pack: prepare updated shallow file before fetching the packNguyễn Thái Ngọc Duy2013-05-285-38/+93
| * | | | | | | | clone: let the user know when check_everything_connected is runNguyễn Thái Ngọc Duy2013-05-111-0/+4
* | | | | | | | | Merge branch 'nd/prune-packed-dryrun-verbose'Junio C Hamano2013-06-063-9/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | prune-packed: avoid implying "1" is DRY_RUN in prune_packed_objects()Nguyễn Thái Ngọc Duy2013-05-283-9/+11
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'fc/transport-helper-no-refspec'Junio C Hamano2013-06-061-1/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | transport-helper: check if the dry-run is supportedFelipe Contreras2013-05-211-0/+5
| * | | | | | | | | transport-helper: barf when user tries old:newFelipe Contreras2013-05-211-2/+4
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Update draft release notes to 1.8.4Junio C Hamano2013-06-051-2/+37
* | | | | | | | | Merge branch 'rs/commit-m-no-edit'Junio C Hamano2013-06-052-4/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | commit: don't start editor if empty message is given with -mRené Scharfe2013-05-282-4/+23
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'fc/send-email-chainreplyto-warning'Junio C Hamano2013-06-052-66/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | send-email: remove warning about unset chainreplytoFelipe Contreras2013-05-282-66/+2
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'fc/cleanups'Junio C Hamano2013-06-054-19/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | test: rebase: fix --interactive testFelipe Contreras2013-05-281-1/+1
| * | | | | | | | | test: trivial cleanupsFelipe Contreras2013-05-282-16/+9
| * | | | | | | | | remote: trivial style cleanupFelipe Contreras2013-05-281-2/+1
| |/ / / / / / / /