delta/git.git, branch sb/remove-gitview

doc: git-gui browser does not default to HEAD

2017-01-13T20:23:28+00:00

37cd4f7 ("Document git-gui, git-citool as mainporcelain manual pages",
2007-06-21) documented the default, but was shortly followed by c52c945
("git-gui: Allow blame/browser subcommands on bare repositories",
2007-07-17) which, it would appear, as a side effect, removed that default.

Finally document that change.

Signed-off-by: Philip Oakley 
Reviewed-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano

doc: gitk: add the upstream repo location

2017-01-13T20:22:43+00:00

Match the 'git gui' information regarding the graphical browser
and its upstream location.

Signed-off-by: Philip Oakley 
Reviewed-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano

doc: gitk: remove gitview reference

2017-01-13T20:22:41+00:00

contrib/gitview has been removed. Remove the reference.

Signed-off-by: Philip Oakley 
Reviewed-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano

contrib: remove gitview

2017-01-07T21:22:54+00:00

gitview did not have meaningful contributions since 2007, which gives the
impression it is either a mature or dead project.

In both cases we should not carry it in git.git as the README for contrib
states we only want to carry experimental things to give early exposure.

Recently a security vulnerability was reported by Javantea, so the decision
to either fix the issue or remove the code in question becomes a bit
more urgent.

Reported-by: Javantea 
Signed-off-by: Stefan Beller 
Acked-by: Aneesh Kumar K.V 
Signed-off-by: Junio C Hamano

Git 2.8.4

2016-06-06T21:29:32+00:00

Signed-off-by: Junio C Hamano

Merge branch 'kb/msys2-tty' into maint

2016-06-06T21:27:38+00:00

The "are we talking with TTY, doing an interactive session?"
detection has been updated to work better for "Git for Windows".

* kb/msys2-tty:
  mingw: make isatty() recognize MSYS2's pseudo terminals (/dev/pty*)

Merge branch 'da/difftool' into maint

2016-06-06T21:27:37+00:00

"git difftool" learned to handle unmerged paths correctly in
dir-diff mode.

* da/difftool:
  difftool: handle unmerged files in dir-diff mode
  difftool: initialize variables for readability

Merge branch 'tb/core-eol-fix' into maint

2016-06-06T21:27:36+00:00

A couple of bugs around core.autocrlf have been fixed.

* tb/core-eol-fix:
  convert.c: ident + core.autocrlf didn't work
  t0027: test cases for combined attributes
  convert: allow core.autocrlf=input and core.eol=crlf
  t0027: make commit_chk_wrnNNO() reliable

Merge branch 'ar/diff-args-osx-precompose' into maint

2016-06-06T21:27:35+00:00

Many commands normalize command line arguments from NFD to NFC
variant of UTF-8 on OSX, but commands in the "diff" family did
not, causing "git diff $path" to complain that no such path is
known to Git.  They have been taught to do the normalization.

* ar/diff-args-osx-precompose:
  diff: run arguments through precompose_argv