summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pf/editor-ignore-sigint'Junio C Hamano2013-01-032-6/+24
|\
| * launch_editor: propagate signals from editor to gitJeff King2012-12-021-1/+4
| * run-command: do not warn about child death from terminalJeff King2012-12-021-1/+2
| * launch_editor: ignore terminal signals while editor has controlPaul Fox2012-12-021-1/+8
| * launch_editor: refactor to use start/finish_commandJeff King2012-12-021-1/+9
| * run-command: drop silent_exec_failure arg from wait_or_whineJeff King2012-12-021-4/+3
* | Merge branch 'mh/pthreads-autoconf'Junio C Hamano2013-01-031-1/+11
|\ \
| * | configure.ac: fix pthreads detection on Mac OS XMax Horn2012-11-271-1/+11
* | | Merge branch 'mk/qnx'Junio C Hamano2013-01-033-3/+27
|\ \ \
| * | | Port to QNXMatt Kraai2012-12-192-1/+26
| * | | Make lock local to fetch_packMatt Kraai2012-12-191-2/+1
* | | | Merge branch 'dm/port'Junio C Hamano2013-01-033-1/+34
|\ \ \ \ | |/ / /
| * | | git-compat-util.h: do not #include <sys/param.h> by defaultJunio C Hamano2012-12-193-10/+6
| * | | Generalize the inclusion of strings.hDavid Michael2012-12-153-1/+14
| * | | Detect when the passwd struct is missing pw_gecosDavid Michael2012-12-152-0/+11
| * | | Support builds when sys/param.h is missingDavid Michael2012-12-153-0/+13
* | | | Merge branch 'ss/nedmalloc-compilation'Junio C Hamano2013-01-031-1/+4
|\ \ \ \
| * | | | nedmalloc: Fix a compile warning (exposed as error) with GCC 4.7.2Sebastian Schuberth2012-12-111-1/+4
* | | | | Merge branch 'jc/maint-fnmatch-old-style-definition'Junio C Hamano2013-01-031-12/+12
|\ \ \ \ \
| * | | | | compat/fnmatch: update old-style definition to ANSIJunio C Hamano2012-12-191-12/+12
* | | | | | Start 1.8.2 cycleJunio C Hamano2013-01-023-2/+99
* | | | | | Merge branch 'jc/test-portability'Junio C Hamano2013-01-022-6/+10
|\ \ \ \ \ \
| * | | | | | t9020: use configured Python to run the test helperJunio C Hamano2012-12-191-3/+7
| * | | | | | t3600: Avoid "cp -a", which is a GNUismJunio C Hamano2012-12-191-3/+3
| * | | | | | Merge branch 'jc/maint-test-portability' into 'jc/test-portability'Junio C Hamano2012-12-193-6/+8
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'jc/maint-fbsd-sh-ifs-workaround'Junio C Hamano2013-01-021-2/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | sh-setup: work around "unset IFS" bug in some shellsJunio C Hamano2012-12-101-2/+5
* | | | | | | | | Merge branch 'sp/shortlog-missing-lf'Junio C Hamano2013-01-024-12/+34
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | strbuf_add_wrapped*(): Remove unused return valueSteffen Prohaska2012-12-112-9/+8
| * | | | | | | | | shortlog: fix wrapping lines of wraplenSteffen Prohaska2012-12-112-3/+26
* | | | | | | | | | Merge branch 'md/gitweb-sort-by-age'Junio C Hamano2013-01-021-14/+21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | gitweb: Sort projects with undefined ages lastMatthew Daley2012-12-111-14/+21
* | | | | | | | | | | Merge branch 'nd/invalidate-i-t-a-cache-tree'Junio C Hamano2013-01-023-17/+65
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | cache-tree: invalidate i-t-a paths after generating treesNguyễn Thái Ngọc Duy2012-12-152-2/+32
| * | | | | | | | | | | cache-tree: fix writing cache-tree when CE_REMOVE is presentNguyễn Thái Ngọc Duy2012-12-152-7/+24
| * | | | | | | | | | | cache-tree: replace "for" loops in update_one with "while" loopsNguyễn Thái Ngọc Duy2012-12-151-5/+10
| * | | | | | | | | | | cache-tree: remove dead i-t-a code in verify_cache()Nguyễn Thái Ngọc Duy2012-12-151-6/+2
* | | | | | | | | | | | Merge branch 'jk/repack-ref-racefix'Junio C Hamano2013-01-021-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | refs: do not use cached refs in repack_without_refJeff King2012-12-211-1/+4
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'rb/http-cert-cred-no-username-prompt'Junio C Hamano2013-01-021-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | http.c: Avoid username prompt for certifcate credentialsRene Bredlau2012-12-211-0/+1
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'mk/maint-graph-infinity-loop'Junio C Hamano2013-01-023-6/+16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | graph.c: infinite loop in git whatchanged --graph -mMichał Kiedrowicz2012-09-253-6/+16
* | | | | | | | | | | | | Merge branch 'ss/svn-prompt'Junio C Hamano2013-01-022-28/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-svn, perl/Git.pm: extend and use Git->prompt method for querying usersSven Strickroth2012-12-172-20/+24
| * | | | | | | | | | | | | perl/Git.pm: Honor SSH_ASKPASS as fallback if GIT_ASKPASS is not setSven Strickroth2012-12-171-2/+5
| * | | | | | | | | | | | | git-svn, perl/Git.pm: add central method for prompting passwordsSven Strickroth2012-12-172-20/+45
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jc/mkstemp-more-careful-error-reporting'Junio C Hamano2013-01-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | xmkstemp(): avoid showing truncated template more carefullyJunio C Hamano2012-12-181-1/+1
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jc/test-cvs-no-init-in-existing-dir'Junio C Hamano2013-01-021-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \