Commits

Author Commit Message Labels Comments Date
Junio C Hamano
Merge branch 'ef/help-cmd-prefix' * ef/help-cmd-prefix: help: always suggest common-cmds if prefix of cmd
Junio C Hamano
Merge branch 'tc/http-urls-ends-with-slash' * tc/http-urls-ends-with-slash: http-fetch: rework url handling http-push: add trailing slash at arg-parse time, instead of later on http-push: check path length before using it http-push: Normalise directory names when pushing to some WebDAV servers http-backend: use end_url_with_slash() url: add str wrapper for end_url_with_slash() shift end_url_with_slash() from http.[ch] to url.[…
Junio C Hamano
Merge branch 'tc/format-patch-p' * tc/format-patch-p: format-patch: page output with --stdout
Junio C Hamano
Merge branch 'ef/win32-dirent' * ef/win32-dirent: win32: use our own dirent.h msvc: opendir: handle paths ending with a slash win32: dirent: handle errors msvc: opendir: do not start the search msvc: opendir: allocate enough memory msvc: opendir: fix malloc-failure Conflicts: Makefile
Junio C Hamano
Merge branch 'mz/rebase-i-verify' * mz/rebase-i-verify: rebase: support --verify
Junio C Hamano
Merge branch 'mz/rebase-abort-reflog-fix' * mz/rebase-abort-reflog-fix: rebase --abort: do not update branch ref
Junio C Hamano
Merge branch 'jk/maint-reflog-bottom' * jk/maint-reflog-bottom: reflogs: clear flags properly in corner case
Junio C Hamano
Merge branch 'jk/asciidoc-update' * jk/asciidoc-update: docs: default to more modern toolset
Junio C Hamano
Merge branch 'mz/pull-rebase-rebased' * mz/pull-rebase-rebased: Use reflog in 'pull --rebase . foo'
Junio C Hamano
Merge branch 'mz/maint-rebase-stat-config' * mz/maint-rebase-stat-config: rebase: only show stat if configured to true
Junio C Hamano
Merge branch 'jn/git-cmd-h-bypass-setup' * jn/git-cmd-h-bypass-setup: update-index -h: show usage even with corrupt index merge -h: show usage even with corrupt index ls-files -h: show usage even with corrupt index gc -h: show usage even with broken configuration commit/status -h: show usage even with broken configuration checkout-index -h: show usage even in an invalid repository branch -h: show usage even in an invalid re…
Stefan Haller
gitk: Make text selectable on Mac Stolen from git-gui, 23effa79f7 (original log message by Shawn O. Pearce <spearce@spearce.org> follows): git-gui: Force focus to the diff viewer on mouse click. Apparently a "feature" of Tcl/Tk on Mac OS X is that a disabled text widget cannot receive focus or receive a selection within it. This makes the diff viewer almost useless on that platform as you cannot select indiv…
Stefan Haller
gitk: Prevent the text pane from becoming editable When setting the "Patch/Tree" radio buttons to "Tree" and clicking on a file to display it, the text pane would accidentally become editable (because of the early return in getblobline). Signed-off-by: Stefan Haller <stefan@haller-berlin.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
Thomas Rast
gitk: Add the equivalent of diff --color-words Use the newly added 'diff --word-diff=porcelain' to teach gitk a color-words mode, with two different modes analogous to the --word-diff=plain and --word-diff=color settings. These are selected by a dropdown box. As an extra twist, automatically enable this word-diff support when the user mentions a word-diff related option on the command line. These options were previously ignored because they …
Peter Krefting
gitk: Update Swedish translation (290t) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Paul Mackerras <paulus@samba.org>
Junio C Hamano
Relnotes: remove items fixed on 'maint' Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint'
Junio C Hamano
Prepare for 1.7.3.4 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jk/maint-decorate-01-bool' into maint * jk/maint-decorate-01-bool: log.decorate: accept 0/1 bool values
Junio C Hamano
Merge branch 'mg/maint-tag-rfc1991' into maint * mg/maint-tag-rfc1991: tag: recognize rfc1991 signatures tag: factor out sig detection for tag display tag: factor out sig detection for body edits verify-tag: factor out signature detection t/t7004-tag: test handling of rfc1991 signatures
Junio C Hamano
Merge branch 'ks/maint-getenv-fix' into maint * ks/maint-getenv-fix: setup: make sure git_dir path is in a permanent buffer, getenv(3) case
Yann Dirson
diff: use "find" instead of "detect" as prefix for long forms of -M and -C It is more consistent with existing --find-copies-harder; luckily "detect" variant has not appeared in any officially released version of git. Signed-off-by: Yann Dirson <ydirson@altern.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King
default color.status.branch to "same as header" This gives it the same behavior as we had prior to 1d28232 (status: show branchname with a configurable color). To do this we need the concept of a "NIL" color, which is provided by color.[ch]. The implementation is very simple; in particular, there are no precautions taken against code accidentally printing the NIL. This should be fine in practice because: 1. You can't input a NIL color in th…
Junio C Hamano
thread-utils.h: simplify the inclusion All files that include this header file use the same four line incantation: #ifndef NO_PTHREADS #include <pthread.h> #include "thread-utils.h" #endif Move the responsibility for that gymnastics to the header file from the files that include it. This approach makes it easier to later declare new services that are related to threading in thread-utils.h and have them available to a…
Jonathan Nieder
Makefile: transport-helper uses thread-utils.h transport-helper.o gained a dependency on thread-utils.h in 7851b1e (remote-fd/ext: finishing touches after code review, 2010-11-17). Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Alejandro R. Sedeño
Add --force to git-send-email documentation Signed-off-by: Alejandro R. Sedeño <asedeno@mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
fetch_populated_submodules(): document dynamic allocation ... while fixing a miscounting. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge git://git.bogomips.org/git-svn * git://git.bogomips.org/git-svn: t9143: do not fail when unhandled.log.gz is not created git-svn: allow the mergeinfo property to be set
Ramsay Jones
msvc: Fix macro redefinition warnings Commit 4091bfc (MinGW: Add missing file mode bit defines, 28-12-2009) causes the msvc build to issue many additional (currently 1008) macro redefinition warnings. The warnings relate to the S_IRUSR, S_IWUSR, S_IXUSR and S_IRWXU macros. In order to fix the warnings, we simply remove the offending macro definitions which, for both msvc and MinGW, are not required. Signed-off-by: Ramsay Jones <rams…
Ramsay Jones
msvc: Fix build by adding missing INTMAX_MAX define Commit c03c831 (do not depend on signed integer overflow, 05-10-2010) provokes an msvc build failure. The cause of the failure is a missing definition of the INTMAX_MAX constant, used in the new maximum_signed_value_of_type(a) macro, which would normally be defined in the C99 <stdint.h> header file. In order the fix the compilation error, we add an appropriate definition of the INTMAX_MAX constan…
  1. Prev
  2. Next