repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'se/doc-checkout-ours-theirs' into maint
2015-08-19
Junio
C
Hamano
Merge branch 's
e
/
doc-che
c
k
out-ou
r
s-theirs'
into maint
commit
|
commitdiff
|
tree
2015-08-19
Junio C
H
a
m
a
no
Mer
g
e branch
'
cb/
u
name-i
n
-untr
a
cked
'
into maint
commit
|
commitdiff
|
tree
2015-08-19
Ju
n
io C Hamano
M
e
rge bra
n
c
h
'as
/
sp
a
rse
-
c
heck
o
ut-
r
emo
v
al'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2015-08-19
J
unio C Hamano
M
erge bra
n
ch 'db/
s
end-pack-
u
ser-signingkey' into maint
commit
|
commitdiff
|
tree
2015-08-19
J
u
nio C Ha
m
a
n
o
Merge branch 'jx/
d
o-not-crash-r
e
ceiv
e
-pack-
w
o
-
head
.
.
.
commit
|
commitdiff
|
tree
2015-08-19
Junio C H
a
mano
Merge bran
c
h 'da/
s
ubtr
e
e-date-confusion' into maint
commit
|
commitdiff
|
tree
2015-08-03
J
unio C Hamano
Sync with 2
.
4
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-03
J
u
n
io C Hamano
Git 2
.
4
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C
Ha
m
a
n
o
M
e
r
ge branch 'js/reba
s
e-i-cl
e
an-up-
u
pon-contin
u
e-to
.
.
.
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge branch 'ss/clone-g
u
e
s
s-di
r
-name-simplify' into
.
.
.
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio C Ham
a
no
Merge bran
c
h 'sg/co
m
p
letion-com
m
it-clean
u
p' i
n
to maint
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge br
a
n
c
h
'pt/am-abor
t
-
f
i
x
' int
o
mai
n
t
commit
|
commitdiff
|
tree
2015-08-03
Junio C
H
aman
o
Merge bran
c
h 'm
h
/reporting-broken-refs-from-for-e
a
ch
.
.
.
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio
C
Hama
n
o
Merge bra
n
ch 'sg/
c
o
m
m
it-cleanup
-
s
c
is
s
ors' into main
t
commit
|
commitdiff
|
tree
2015-07-27
Junio
C
Hamano
Git 2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-27
J
unio C Hamano
Sync with
2
.
4
.
7
commit
|
commitdiff
|
tree
2015-07-27
Jun
i
o C Haman
o
G
i
t 2
.
4
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-27
Junio
C Hama
n
o
Merge branch 'jk/prett
y
-
e
n
c
oding-do
c
' into maint
commit
|
commitdiff
|
tree
2015-07-27
J
unio C Hamano
Merge
b
ranch
'tb/checkout-doc'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2015-07-27
Jun
i
o C Ha
m
ano
Merge bran
c
h 'ls/hint-rev-list
-
count' into main
t
commit
|
commitdiff
|
tree
2015-07-27
Junio
C
Hamano
Merge branch 'mm/branch-doc-
u
pdate
s
'
into maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Merge bra
n
c
h
'jc/fsck-retir
e
-require
-
eoh' into maint
commit
|
commitdiff
|
tree
2015-07-27
J
u
n
io C
H
a
m
ano
Merge
branch 'et/htt
p
-p
r
o
xyauth' into m
a
i
nt
commit
|
commitdiff
|
tree
2015-07-27
Juni
o
C Hamano
Merge branch '
j
c
/un
e
x
port-gi
t
-pager-in-use-in-pager
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C H
a
man
o
M
e
rg
e
branc
h
'mh/st
r
buf-read-file-returns-ssi
z
e-t'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C Ha
m
ano
Merge
bran
c
h
'kb/c
o
nfig-unm
a
p-before-
r
en
a
min
g
' into
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Juni
o
C Ha
m
ano
Merge branch 'jk/rev-l
i
s
t
-no-
b
itmap-wh
i
le-prun
i
ng'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
J
unio C
H
amano
Merge bra
n
ch 'rh/test-col
o
r-avoid-terminfo-in-o
r
igin
a
l
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
J
unio C
H
amano
Merge bra
n
ch
'
jk/fix-
r
efresh-ut
i
me
'
into maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Merge branch 'cb/re
b
ase-am-e
x
it-code' into m
a
int
commit
|
commitdiff
|
tree
2015-07-27
Ju
n
io C Hamano
M
erge branc
h
'jk/index
-
pac
k
-r
e
du
c
e-recheck' into m
a
int
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
RelNotes:
a
m
.
th
r
eeWay does not exist (yet)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
J
u
nio C
H
a
m
a
n
o
Re
v
ert "git-a
m
:
add a
m
.
thr
e
eWay config variable"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-23
David Ag
u
ilar
cont
r
ib/
s
u
btr
e
e: ignore log
.
date conf
i
guration
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-22
J
iang
Xi
n
receive-pack: cras
h
when c
h
ec
k
in
g
with non-e
x
i
st HE
A
D
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-21
J
unio C Ham
a
no
builtin/
s
e
nd-pac
k
.
c: res
p
ect use
r
.
signi
n
gkey
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-21
Junio C Hamano
Git
2
.
5
.
0-r
c
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-21
D
a
vi
d
Turner
u
n
pack-tr
e
es:
d
on't update fi
l
es with CE_WT_REMOVE set
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-21
Junio
C
H
a
mano
Merge branch 't
f
/gitw
e
b
-
t
ypof
i
x'
commit
|
commitdiff
|
tree
2015-07-21
Junio C
H
amano
Merge tag
'
l
10n-2
.
5
.
0-rnd2' of
g
it:/
/
github
.
co
m
/git
.
.
.
commit
|
commitdiff
|
tree
2015-07-17
Charles Bai
l
ey
untracked: f
i
x detec
t
i
on of uname(2) failure
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-17
Junio C Hamano
Me
r
ge br
a
nc
h
'jk/still-in
t
ere
s
ting'
commit
|
commitdiff
|
tree
2015-07-17
Ju
n
i
o
C Hamano
Mer
g
e
branch '
e
s
/w
o
rktre
e
-add
'
commit
|
commitdiff
|
tree
2015-07-17
E
r
i
c Sunshine
Do
c
um
e
ntation/git:
f
ix st
a
l
e
"MULTIP
L
E CHECKOUT
M
ODE
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-16
Junio C Hamano
w
orktre
e
:
caution that t
h
i
s
is still
e
xperimental
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-16
Eric Su
n
shine
Docum
e
ntation/
g
it-worktr
e
e: fix stale "git checkout
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-15
Jun
i
o C
H
amano
Sync wi
t
h 2
.
4
.
6
commit
|
commitdiff
|
tree
2015-07-15
Junio
C
H
a
mano
G
i
t 2
.
4
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-15
Ju
n
io C Haman
o
Merge
b
ranch 'jc
/
d
iff-ws-erro
r
-highlight'
commit
|
commitdiff
|
tree
2015-07-15
Junio
C
Hama
n
o
M
e
r
g
e branch 'mm/
d
e
s
cr
i
be-do
c
' into ma
i
nt
commit
|
commitdiff
|
tree
2015-07-15
J
unio C
H
amano
M
erge bran
c
h 'jc/prompt-d
o
c
u
ment-ps1-state-separator
.
.
.
commit
|
commitdiff
|
tree
2015-07-15
Ju
n
io C
Ha
m
ano
Merge br
a
nch 'es
/
osx-he
a
d
er-pollutes-mask-macro' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-07-15
J
u
nio C Hamano
Merge br
a
nch 'es/u
t
f8-stupid-compiler
-
w
o
rkaround' into
.
.
.
commit
|
commitdiff
|
tree
2015-07-15
Ju
n
io C Hamano
Merge branch 'fk
/
doc-f
o
rmat-pa
t
c
h-vn'
into maint
commit
|
commitdiff
|
tree
2015-07-15
Junio C Hamano
Merge
b
ranch 'pt/t0302-needs-sanity' into ma
i
nt
commit
|
commitdiff
|
tree
2015-07-15
Junio C H
a
mano
M
e
r
g
e
branch 'me/fetch-into-shall
o
w-safet
y
' int
o
maint
commit
|
commitdiff
|
tree
2015-07-15
Junio
C
H
ama
n
o
Mer
g
e branch
'mh/fsck
-
reflog-entri
e
s' into maint
commit
|
commitdiff
|
tree
2015-07-15
J
unio
C
Hamano
Merge b
r
a
nch
'af/tcsh-completio
n
-noclobber' into
m
a
int
commit
|
commitdiff
|
tree
2015-07-15
Junio
C Hamano
Merg
e
branch 'pa/auto-gc-mac-o
s
x
' into maint
commit
|
commitdiff
|
tree
2015-07-15
Junio C Hamano
Merge branch 'jc/do-not-feed-tags-to-clear
-
commit-
m
a
r
ks
.
.
.
commit
|
commitdiff
|
tree
2015-07-13
J
unio C Hamano
Merge
tag 'l10n-2
.
5
.
0
-rnd1' of git:/
/
g
i
thub
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2015-07-13
Junio C Hamano
Git
2
.
5
.
0-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-13
Junio C H
a
m
a
no
M
e
rge br
a
nch 'es/wo
r
ktree-ad
d
'
commit
|
commitdiff
|
tree
2015-07-13
Junio
C
Hamano
M
e
rge bra
n
ch 'nd/multiple-work-trees'
commit
|
commitdiff
|
tree
2015-07-13
J
u
nio C Hamano
Merge bra
n
ch
'ss/
c
lon
e
-g
u
ess-dir-name-si
m
p
lify'
commit
|
commitdiff
|
tree
2015-07-13
Junio C Hamano
Merge br
a
n
c
h
'
kb/config
-
unmap-before-re
n
aming'
commit
|
commitdiff
|
tree
2015-07-13
Junio
C Ha
m
ano
Merge branch 'mh/strbuf-read-file-returns-ssi
z
e-t
'
commit
|
commitdiff
|
tree
2015-07-13
Junio C Hamano
Merge bran
c
h 'jc/unexport
-
git-pager-in-use-in-page
r
'
commit
|
commitdiff
|
tree
2015-07-13
J
u
nio C Hamano
M
e
r
ge branch '
k
b/use-nsec-doc
'
commit
|
commitdiff
|
tree
2015-07-13
J
u
nio C
H
amano
Merge branc
h
'js/rebase-
i
-
c
lean-up-upon-conti
n
ue-to
.
.
.
commit
|
commitdiff
|
tree
2015-07-13
Junio C
H
a
m
ano
Me
r
ge branch 'et
/
h
ttp-
p
ro
x
yauth'
commit
|
commitdiff
|
tree
2015-07-13
Ju
n
io C Hamano
Merge branch '
j
c/
f
sck-retire-require-eoh'
commit
|
commitdiff
|
tree
2015-07-12
René Scharfe
dif
f
: parse ws-err
o
r-highlight op
t
io
n
more stri
c
tly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-12
J
un
i
o C Hamano
R
e
vert "che
c
kout: retire --igno
r
e-ot
h
er-worktrees in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-12
Simon A
.
Eugster
check
o
ut:
d
o
cument subtlety around --ours/
-
-theirs
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-10
Ju
n
io
C
Hamano
The last minute bits
of fi
x
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-10
J
u
nio C Hamano
Merge branch 'cb/rebase-am-e
x
i
t-code'
commit
|
commitdiff
|
tree
2015-07-10
Junio
C Ha
m
ano
Merge branch 'jk/fix-
r
efre
s
h-utim
e
'
commit
|
commitdiff
|
tree
2015-07-10
Junio C
Hamano
Merge branch 'm
m
/b
r
anch
-
d
oc-update
s
'
commit
|
commitdiff
|
tree
2015-07-10
Jun
i
o C Hamano
Merge br
a
nch 'l
s
/hint-re
v
-list-count'
commit
|
commitdiff
|
tree
2015-07-10
Junio C H
a
m
ano
Mer
g
e
b
ranch 'jk/rev-li
s
t-no-bitm
a
p-while-pruning'
commit
|
commitdiff
|
tree
2015-07-10
J
uni
o
C Hamano
Merge branch 'cb/subt
r
ee-tes
t
s
-
update'
commit
|
commitdiff
|
tree
2015-07-10
J
u
n
i
o C Hama
n
o
Merge bran
c
h 'rh/test-c
o
lor-avoid-
t
e
rm
i
n
fo
-
in-orig
i
nal
.
.
.
commit
|
commitdiff
|
tree
2015-07-10
J
u
nio C Hamano
Merge b
r
anch
's
b
/p5310-a
n
d-chain'
commit
|
commitdiff
|
tree
2015-07-10
J
un
i
o C Hamano
Mer
g
e
b
r
anch 'tb/checkout-do
c
'
commit
|
commitdiff
|
tree
2015-07-10
Junio C
H
ama
n
o
Merge branch 'jk/p
r
etty-e
n
c
oding-doc'
commit
|
commitdiff
|
tree
2015-07-10
Junio C
Ham
a
no
Merge branch 'nd/dwim-wildcards-as-pathspecs
'
commit
|
commitdiff
|
tree
2015-07-09
Junio C Hamano
Merg
e
b
r
a
n
ch
'jk/maint-for-each-packed-obje
c
t'
commit
|
commitdiff
|
tree
2015-07-09
Junio C Hamano
Merge branch 'jc/f
i
x
-
a
l
loc-sortbuf-in-index-pack'
commit
|
commitdiff
|
tree
2015-07-09
Sebastian
S
chuberth
clo
n
e
: simplify
string handli
n
g in gues
s
_dir_name
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-08
Jeff Kin
g
c
he
c
k
_
and_freshen_file: f
i
x
reversed success-
c
h
eck
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-08
C
l
e
mens
B
u
chacher
rebase: return no
n
-z
e
ro error code if fo
r
mat-pat
c
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-07
E
r
ic Sunshin
e
checkout
:
re
t
ire --
i
gnore-other-worktr
e
es in favor
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-07
Eric Su
n
s
hi
n
e
w
orktr
e
e
: add: auto-vivi
f
y
n
ew branch when
<
branch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-06
Er
i
c Sunshine
worktr
e
e: ad
d
: ma
k
e
-
b/-B default to HEAD wh
e
n
<
bra
n
ch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-06
Eric Sunshin
e
worktree: extract base
n
ame c
o
mputation to new f
u
n
c
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-06
Eric Sunsh
i
ne
chec
k
out: requir
e
worktree unconditionally
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-06
Eric Sunshine
checko
u
t
: retire --to op
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-06
Eric S
u
n
shine
tests: worktree: retrofit "checkout --t
o
" tests
f
or
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-06
Eric Sunshine
worktree: add -
b
/-B o
p
t
i
o
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next