repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Sync with 2.4.6
2015-07-15
Junio C Ha
m
a
no
Sync wi
t
h
2
.
4
.
6
commit
|
commitdiff
|
tree
2015-07-15
Junio C Hamano
Git
2
.
4
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-15
Junio
C Hamano
Merge bra
n
ch 'jc/diff-ws-error-highlight
'
commit
|
commitdiff
|
tree
2015-07-15
Junio C Hamano
M
erge branch '
m
m/describe-
d
oc' into m
a
int
commit
|
commitdiff
|
tree
2015-07-15
Junio C Hamano
Merge
branch 'jc/promp
t
-docume
n
t-ps1-state-
s
e
parator
.
.
.
commit
|
commitdiff
|
tree
2015-07-15
Junio C H
a
man
o
Merge branch 'es/
o
sx-header-pollut
e
s-mask-macro' into
.
.
.
commit
|
commitdiff
|
tree
2015-07-15
Junio
C
Hamano
Mer
g
e br
a
n
c
h 'es/utf8-stupid-compiler
-
worka
r
ound' into
.
.
.
commit
|
commitdiff
|
tree
2015-07-15
Ju
n
io C Hamano
M
e
rge bran
c
h 'fk/doc-form
a
t-patch-
v
n'
into maint
commit
|
commitdiff
|
tree
2015-07-15
Juni
o
C
H
a
m
ano
Merge
b
ranch 'pt/t0302-n
e
e
d
s
-sanity' into m
a
int
commit
|
commitdiff
|
tree
2015-07-15
J
u
nio C Hamano
Merge branch 'me/
f
etch-into-
s
hallow
-
s
a
f
et
y
' into ma
i
n
t
commit
|
commitdiff
|
tree
2015-07-15
Juni
o
C Hamano
Merge bra
n
ch 'mh/fsck-
r
e
f
l
o
g-
e
ntrie
s
' into maint
commit
|
commitdiff
|
tree
2015-07-15
J
u
n
io C Hamano
M
e
r
g
e
branch 'af/tcsh-compl
e
tio
n
-noclobber' into ma
i
nt
commit
|
commitdiff
|
tree
2015-07-15
Junio C Hamano
Merge b
r
anch 'pa/auto-
g
c-mac-osx' in
t
o m
a
i
nt
commit
|
commitdiff
|
tree
2015-07-15
J
u
nio
C Hamano
Me
r
g
e
b
r
anch 'jc/do-not-feed-tag
s
-
t
o-clear-commit-marks
.
.
.
commit
|
commitdiff
|
tree
2015-07-13
Jun
i
o C H
a
mano
Mer
g
e
tag 'l10n-2
.
5
.
0-r
n
d1' of git://github
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2015-07-13
Juni
o
C Hamano
Git 2
.
5
.
0-r
c
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-13
Junio
C
Hamano
M
e
r
g
e bran
c
h 'es/worktree-add'
commit
|
commitdiff
|
tree
2015-07-13
Junio
C
H
a
mano
Merge br
a
n
ch 'nd/multiple-work
-
trees'
commit
|
commitdiff
|
tree
2015-07-13
J
uni
o
C
Hamano
Merg
e
branch
'
ss
/
c
lone-gues
s
-dir-n
a
m
e-
s
implify'
commit
|
commitdiff
|
tree
2015-07-13
Junio C Ha
m
ano
M
erge b
r
anch
'
kb/config-unmap-before-renaming'
commit
|
commitdiff
|
tree
2015-07-13
Junio
C Haman
o
Me
r
ge
b
ranch 'mh/strbuf-read
-
file-retur
n
s-ssize-t'
commit
|
commitdiff
|
tree
2015-07-13
J
uni
o
C Hama
n
o
Merge branch 'jc/unexport-g
i
t-pager-in-use-in-pager'
commit
|
commitdiff
|
tree
2015-07-13
Junio C Hamano
Merg
e
b
ranch '
k
b/use-ns
e
c
-doc
'
commit
|
commitdiff
|
tree
2015-07-13
Junio C Hamano
Merge
b
ranch 'js
/
rebase-i-clean-up
-
upon-continu
e
-to
.
.
.
commit
|
commitdiff
|
tree
2015-07-13
Jun
i
o C H
a
mano
Merge bran
c
h 'et
/
http-prox
y
auth'
commit
|
commitdiff
|
tree
2015-07-13
J
u
nio C Hamano
Merg
e
branch 'jc/fsck-retire-requ
i
re-eoh'
commit
|
commitdiff
|
tree
2015-07-12
René Scharfe
diff: pa
r
s
e ws-error-highlig
h
t option
m
o
re
s
t
ri
c
t
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-12
Junio
C
Ha
m
an
o
Re
v
ert "c
h
e
c
kout: retire
--ign
o
re-other-wo
r
ktr
e
e
s
in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-10
Junio C Hamano
The
l
a
st minute bits of fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-10
Junio C Ha
m
ano
Merge br
a
nch 'cb/rebase
-
am-
e
xit-cod
e
'
commit
|
commitdiff
|
tree
2015-07-10
Junio C Haman
o
Merge br
a
nch 'jk/fix-r
e
fresh-utim
e
'
commit
|
commitdiff
|
tree
2015-07-10
Junio
C Hamano
Merge
b
r
anch 'mm
/
bran
c
h-d
o
c-updates
'
commit
|
commitdiff
|
tree
2015-07-10
Junio C Hamano
Merg
e
branch 'ls/hint-rev-
l
ist-c
o
unt'
commit
|
commitdiff
|
tree
2015-07-10
J
unio C Hamano
Merge branch 'jk/rev-list-n
o
-bitmap-whi
l
e-
p
runing'
commit
|
commitdiff
|
tree
2015-07-10
Junio C H
a
mano
Merge branch
'cb/subtree-test
s
-update'
commit
|
commitdiff
|
tree
2015-07-10
Junio C Hamano
M
e
rge bra
n
ch 'rh/tes
t
-color
-
avoid-terminfo
-
in-
o
r
i
ginal
.
.
.
commit
|
commitdiff
|
tree
2015-07-10
Junio C Ha
m
ano
M
erge branch 'sb/p5310-and-
c
hain
'
commit
|
commitdiff
|
tree
2015-07-10
Jun
i
o
C Hamano
Merge
b
ran
c
h '
t
b/checkout-doc'
commit
|
commitdiff
|
tree
2015-07-10
Junio C
H
amano
Merg
e
branch 'jk/pretty-enco
d
ing-do
c
'
commit
|
commitdiff
|
tree
2015-07-10
Junio
C
Ham
a
no
Merge
branch 'nd/dwim-wi
l
dcards-as-pathsp
e
cs
'
commit
|
commitdiff
|
tree
2015-07-09
Ju
n
io C Hamano
Merge branch 'jk/maint-for-
e
ach-p
a
cked-object'
commit
|
commitdiff
|
tree
2015-07-09
Junio C Hamano
Merge branch 'jc/fix-a
l
loc-sortbuf-in-index-pa
c
k
'
commit
|
commitdiff
|
tree
2015-07-09
Sebastian Schuberth
c
lone
:
s
i
mplify s
t
ri
n
g h
a
ndling
in gues
s
_dir_name()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-08
Jef
f
King
check
_
and_
f
reshen_file: fix r
e
versed success-c
h
eck
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-08
Clemens Buchacher
rebase
:
return non-ze
r
o error co
d
e
if form
a
t-patch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-07
Eric Sunshine
che
c
kout:
ret
i
r
e --ignore-oth
e
r-worktr
e
es
i
n favor
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-07
Eric Sunshine
w
o
rktree: add
:
au
t
o-
v
i
vify new
b
ra
n
c
h
when <bra
n
ch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Eri
c
Sunshine
w
orktree: a
d
d: make -b/-B d
e
fault
t
o HEAD when <branch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Eri
c
Sunshine
w
o
rktree: extract basename computation
to new
function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Eric Sunshine
checkout: require
w
o
r
ktree unc
o
ndition
a
lly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Eric Sunshine
che
c
kout: retire --to option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Eric Sunshine
tests: worktree: re
t
rof
i
t "ch
e
ckout
--to" tes
t
s for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Er
i
c Sun
s
h
i
ne
worktree: add -
b
/-B option
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Eric Sunshine
worktree
:
add --detach
o
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
E
r
i
c Sunshi
n
e
worktree: add --fo
r
ce option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Eric Sunshine
wo
r
ktree: in
t
roduce "
a
dd" command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Eri
c
Sunshine
ch
e
cko
u
t: drop
'
checko
u
t_opts' dependency from p
r
e
pare_linke
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Eric Su
n
shine
c
heckout: make --to uncondi
t
ionally ver
b
ose
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Eric S
u
nshine
check
o
ut:
prepare_l
i
nked_chec
k
out:
d
rop no
w
-unused
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Eric Su
n
shine
checkout: reloca
t
e
-
-
to's "no br
a
nch specified" check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Er
i
c Sunshine
checkout: fix b
u
g with --to and relative HEAD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
E
r
ic Sunshine
Docu
m
e
ntatio
n
/git-worktree: add EXAMPLES section
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Eric Sunshi
n
e
Documentation/git-workt
r
e
e
: add high-level 'lock' over
v
iew
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
E
r
ic Sun
s
hine
Docume
n
ta
t
ion/git
-
worktree: spl
i
t
tec
h
nical
info fr
o
m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
E
ric Sunshine
D
ocumentatio
n
/
git-wor
k
tree:
add BUGS sec
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
E
ric Sunshine
D
o
cumentation: mov
e
linked worktree descr
i
p
t
ion fr
o
m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
E
ric
S
uns
h
ine
Do
c
umentatio
n
/git-work
t
ree: associate options with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Eric Sunshine
Documenta
t
ion/
g
it-checkout: fix incorrect worktree
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Matthieu
Moy
Documentation/branch: docu
m
ent
-
M and -D in terms o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Matthi
e
u Moy
Documentation/bra
n
ch: document
-
d
-
-force and -m -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Matth
i
eu Moy
git-mu
l
timail:
u
pda
t
e
t
o r
e
lease 1
.
1
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-04
Junio C Ha
m
a
n
o
index-pack: fix
all
o
cation of sort
e
d_by_
p
os array
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-04
M
i
c
hael
Haggerty
s
trbuf: strb
u
f_
r
e
ad_file() should return ssize
_
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-04
Junio C H
a
mano
pag
e
r: do not leak "GIT
_
PAGER_IN_USE" t
o
the pager
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-01
Ka
r
st
e
n
Blees
Makefile
/ racy-git
.
txt: c
l
arify USE_NSEC pre
r
e
qui
s
i
t
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-01
Junio
C Hamano
Git 2
.
5
.
0-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-01
Ju
n
io
C
Hamano
Merge br
a
nch
'me/fet
c
h-
i
nto-shallow-safety'
commit
|
commitdiff
|
tree
2015-07-01
Junio C
H
a
m
ano
Merg
e
bra
n
ch 'jc/prompt
-
docu
m
ent-ps1-state-
s
epar
a
tor'
commit
|
commitdiff
|
tree
2015-07-01
Junio C
H
amano
Merge
bran
c
h 'mm/d
e
s
c
r
i
be-doc'
commit
|
commitdiff
|
tree
2015-07-01
Jun
i
o C
Ha
m
ano
Me
r
ge
b
ranch 'da/mer
g
e
t
ool-winmer
g
e'
commit
|
commitdiff
|
tree
2015-07-01
Jeff King
rev-list: disab
l
e
--
u
se-bitmap-ind
e
x when pruning
c
ommit
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-01
N
guyễn Thái N
g
ọc
D
uy
Add tests for w
i
ldca
r
d "p
a
th vs ref" disamb
i
guation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-01
Lawrence Siebert
r
e
v-l
i
st: ad
d
-
-count to usage guide
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-30
K
a
rsten Blees
conf
i
g
.
c: fix writing config fil
e
s on Windo
w
s netwo
r
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-29
Jo
h
annes Schind
e
lin
reb
a
s
e
-
i
:
d
o n
o
t
le
a
v
e
a C
H
ERR
Y
_PICK_HEAD file beh
i
n
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-29
J
o
hannes Schindelin
t
3404: demonstra
t
e
CHE
R
R
Y
_PI
C
K_H
E
AD bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-29
E
n
rique Tobis
h
t
t
p
: alwa
y
s us
e
a
n
y proxy auth m
e
thod availabl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-29
Ng
u
yễ
n
T
hái Ngọc Du
y
worktree
:
new place for "gi
t
p
ru
n
e --worktrees"
commit
|
commitdiff
|
tree
2015-06-28
Junio C
Hamano
Sync w
i
t
h
main
t
commit
|
commitdiff
|
tree
2015-06-28
Ju
n
io C Hamano
f
s
ck: it is OK f
o
r a tag and a
commit to lack
the body
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-26
Ste
f
an B
e
ller
p5310: Fix brok
e
n &
&
ch
a
in in p
e
rformance test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-26
Jun
i
o C H
a
mano
Me
r
ge
b
r
anch 'jk/stash-re
q
ui
r
e-
c
l
e
an
-
in
d
ex' into maint
commit
|
commitdiff
|
tree
2015-06-26
Junio C H
a
mano
Mer
g
e
branch '
c
b/array-size' into maint
commit
|
commitdiff
|
tree
2015-06-25
Junio C Hama
n
o
G
i
t 2
.
5
.
0
-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-25
J
unio C
H
amano
Merge branch '
c
n/cvsimport-perl-update'
commit
|
commitdiff
|
tree
2015-06-25
Junio C Ham
a
no
Merge
b
ra
n
ch 'cb/arra
y
-s
i
ze'
commit
|
commitdiff
|
tree
2015-06-25
Ju
n
io C Ha
m
ano
Sync with 2
.
4
.
5
commit
|
commitdiff
|
tree
2015-06-25
J
un
i
o
C
Hamano
Git 2
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-25
Junio C Hamano
Me
r
ge branc
h
's
g
/mer
g
e-s
u
mmar
y
-config' into maint
commit
|
commitdiff
|
tree
2015-06-25
Junio C H
a
mano
Me
r
ge branch
'
j
k/mak
e
-fix-depen
d
e
n
c
ies'
into maint
commit
|
commitdiff
|
tree
next