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
t4150: am fails if index is dirty
2015-06-09
SZEDER Gábor
commit: cope with scissors lines in c
o
mmit
message
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-09
Ariel
F
aigon
git-c
o
mplet
i
on
.
tcsh
:
fix r
e
direct with
n
oclo
b
ber
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-08
P
a
ul Tan
am --abort: keep un
r
elated commits on unb
o
rn branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul
T
an
am --abo
r
t
:
s
u
pport aborting
t
o unborn branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am
--a
b
ort: revert chang
e
s introduced by f
a
iled 3way
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-08
Pau
l
T
an
am --skip
:
support s
k
ip
p
ing wh
i
le on un
b
orn branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am -3
:
support 3way merge o
n
unborn branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-08
Pau
l
T
a
n
am --skip:
r
e
v
ert
c
h
a
nges
i
n
tro
d
uced by failed 3way
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-08
Mi
c
hael Haggerty
f
sck
:
report e
r
rors if reflog
e
ntries point a
t
invalid
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-08
M
i
chae
l
Haggerty
fsck_h
a
ndle_
r
eflog_sha
1
(): new func
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-08
M
i
chael
H
aggerty
read
_
loose_refs
(
): tr
e
a
t NULL
_
SHA1
l
o
o
s
e re
f
erenc
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-08
Nguyễn Thái Ng
ọ
c Duy
read-ca
c
he: fix
u
ntracked
ca
c
he in
v
alid
a
ti
o
n w
h
en split
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-08
Luk
e
D
iama
n
d
git-p4: test w
i
th li
m
ited p4 server
r
esults
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-08
Luke Diama
n
d
git-p4: additional te
s
ting of --changes-block-si
z
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-08
SZEDER Gábor
completion: tea
c
h 'scissors' mode to 'git c
o
mmit
-
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
E
r
i
c
Sunsh
i
n
e
utf8: NO_ICONV: silence unin
i
tiali
z
ed varia
b
l
e war
n
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
J
ohannes Sixt
lockfile:
w
ait using sleep_
m
illisec() inste
a
d of select()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Johannes
S
i
x
t
l
ockfile:
convert r
e
t
ry t
i
meout comput
a
tions to
m
illisecond
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Joh
a
nnes Sixt
help
.
c: wrap wait-onl
y
poll() invo
c
ati
o
n in
sleep_
m
i
l
lis
e
c()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Joh
a
nnes Sixt
l
o
ckfile:
r
eplace random() by rand
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Sync with 2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Git 2
.
4
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hama
n
o
The firs
t
half
of the se
v
enth batch for 2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
H
a
mano
Merge branch 'ld/p4-editor-mu
l
ti-words'
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
Merge branch
'
b
c/
o
b
ject-id'
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Ha
m
ano
Me
r
g
e
branch 'jk
/
at-push
-
sha1'
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
Me
r
ge branch
'
dl/
b
ran
c
h-error-message' into main
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'jk/skip-http-tests
-
under-no-
c
u
r
l' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
Mer
g
e branch 'ps/
d
oc-packfile-
v
s-pack-fil
e
' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
a
mano
Merge br
a
nc
h
'fg/docu
m
ent-commi
t
-messa
g
e-strip
p
ing
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Hamano
Me
r
ge
branch
'
jk/rerer
e
-forget-
c
heck-enabled' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Merge bran
c
h 'p
t
/p
u
ll-l
o
g
-
n' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Me
r
ge b
r
anch
'pt/p
u
ll-
f
f-vs-merge-ff
'
into
maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Merge bra
n
ch 'rs/plug-le
a
k
-
in-pack-bitmaps'
into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Haman
o
Merge bran
c
h 'ja/
t
utorial-asciido
c
tor-fix' into
m
aint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Merge branch 'jk/
s
tr
i
pspace-asciid
o
ctor-fix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Ha
m
a
n
o
Merge branch 'jk/
a
sciid
o
c-m
a
rkup-fix'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
i
o C Hamano
Merge branch 'ps/bundl
e
-verify-arg' into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Ham
a
no
Merge b
r
anch 'mh/wr
i
te-refs-s
o
oner
-
2
.
4' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
Merg
e
b
r
anch 'mh/
r
ef-direc
t
ory-fil
e
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
a
mano
Merge branch 'mg/l
o
g-dec
o
rate-H
E
AD'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
H
aman
o
Mer
g
e branch '
s
b/t1020-
c
leanup' i
n
to ma
i
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Mer
g
e bran
c
h 'jc/gitignore
-
pr
e
c
ed
e
nce
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
e
rge branch
'
b
c/connect-plink'
i
n
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
Merge
br
a
nch 'ph/rebase-i-redo' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge bra
n
ch 'jk/add-e-kill-edi
t
or' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Haman
o
M
e
rge branch 'm
h
/clo
n
e
-
verb
o
s
i
t
y
-
fix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ha
m
a
no
Merg
e
branch 'jk/sha1-file
-
reduce-useless-
w
arni
n
gs
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio
C Hamano
M
erge bran
c
h 't
b
/bl
a
me-re
s
u
r
rect-convert-to-git' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
e
rge branch 'jc/plug-fmt-
m
erge
-
m
sg-leak
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Haman
o
Me
r
ge b
r
a
n
c
h 'pt
/
xdg-conf
i
g-pat
h
'
into
m
ai
n
t
commit
|
commitdiff
|
tree
2015-06-04
Junio C Hamano
l
l
-me
r
ge:
p
ass
the o
r
iginal path t
o
ex
t
ernal d
r
i
vers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-04
Remi
Lespi
n
et
git-
a
m: add am
.
threeWay config variable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-04
Remi Lespinet
t4150-am: refactor am -3 tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-04
Remi
L
e
sp
i
net
g
i
t-am
.
sh: fix
in
i
tialization of the three
w
a
y
var
i
a
b
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-04
Je
f
f King
index-pa
c
k: fix trun
c
ation of of
f
_t in comparison
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-03
Mic
h
ael Haggert
y
read_loose_
r
efs
(
): simplify function logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-03
Eric Su
n
shi
n
e
configure:
add getdeli
m
() check
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-03
Eric
Suns
h
ine
config
.
m
ak
.
uname: Dar
w
in: define HAVE_G
E
TDEL
I
M
f
or
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-03
Jeff King
e
w
ah
:
use less gene
r
i
c
macro name
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-03
E
ric Sunshine
ewah/bitmap: silence warning
about MASK macro
redefinition
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-02
S
tefan
Beller
D
o
cu
m
entation
/
technical/pack-protocol:
mentio
n
h
t
tp
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
pull: use git-
r
ev-par
s
e -
-
pa
r
seopt for optio
n
parsing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-02
Pa
u
l Tan
pull: handle git-fetch's options as well
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-02
Junio
C Ham
a
no
Merge
b
ranch 'pt/pull-tests
'
in
t
o pt/
p
u
l
l-optparse
commit
|
commitdiff
|
tree
2015-06-02
Mich
a
el H
a
gger
t
y
f
o
r
-
e
ach
-
ref: report broken
r
eferences correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-02
M
ich
a
el
Hagger
t
y
t
6
301: new test
s
o
f for-each
-
ref error handling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io
C H
a
mano
f
or
m
at-patch
:
do
not feed tags to clear_commit_marks()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Eric Sunshine
send-e
m
ail: further w
a
rn
ab
o
ut un
s
u
p
por
t
ed send
m
a
i
l
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Eri
c
Sunshi
n
e
t9001: add sendmail aliases
l
ine co
n
t
inuation tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Eric
S
u
n
shine
t
9
0
0
1
: refa
c
tor se
n
d
mai
l
aliases test infrast
r
uct
u
r
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Eric
S
unshine
send-
e
m
ail: implement send
m
a
il
aliases
line contin
u
at
i
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Eric Sunshin
e
send-email: simplify sendmail aliases co
m
m
ent and blank
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
E
r
ic Su
n
shine
send-email: refactor sendmail aliases parser
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
E
r
ic Sunshine
s
e
n
d-
e
mail: fix style
:
cuddle
'
els
i
f' and 'els
e
' with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Eric Sun
s
hine
s
e
nd-ema
i
l: dr
o
p noise
c
omments which mer
e
ly repeat
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Eric Sunshine
s
end-email: vis
u
ally distingui
s
h se
n
dmail aliase
s
parser
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Er
i
c Sunshine
send-email:
f
urth
e
r
d
ocument missing sendmail ali
a
ses
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Quen
t
in Neill
b
l
ame: add blame
.
s
h
owE
m
ail
c
onfiguratio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io
C
Hamano
Sixth batch for 2
.
5
c
ycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ha
m
ano
M
e
rge b
r
anch 'sb/
t
est-bitmap-
f
ree
-
at-end'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hamano
Merge branch
'
mm/
r
ebas
e
-i-post-re
w
r
i
te-exec'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hama
n
o
Merge br
a
nch 'fm/f
e
tch-
r
aw
-
sha1'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge b
r
anch 'sg/help-
g
roup'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
amano
Me
r
ge branch 'mm/log-format-raw-
d
oc'
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C H
a
mano
Merge branch
'
d
t/cat-
f
ile-follow-
s
ymlinks'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
M
erg
e
br
a
nch '
r
s/j
a
ni
t
orial'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
amano
Merge branch 'jk/
s
tash-
o
ptions'
commit
|
commitdiff
|
tree
2015-06-01
J
uni
o
C Ham
a
no
Merge branc
h
'
d
a/mergetool-wi
n
merge'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge
b
ranch
'mc/
c
ommi
t
-do
c
-
gramm
o
fix
'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C H
a
ma
n
o
M
e
rge branch 'jh/filter-
e
mpty-contents'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C
Hamano
Merge
b
ranch '
a
h/usa
g
e-strings'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch 'jk/htt
p
-backend-deadlock'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch 'dt/clea
n
-pathspec-filter-t
h
en-lst
a
t'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
apply: reject a hunk that does n
o
t do anythin
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Jeff King
sup
p
r
e
ss er
r
ors on miss
i
n
g UNINTERESTING lin
k
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Jeff K
i
ng
silence broken li
n
k warnings
w
i
th rev
s
-
>
ignore_missing_links
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Jeff K
i
ng
a
d
d
q
uiete
r
versions of parse_{tree,commit}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Thom
a
s
Br
a
un
com
p
leti
o
n
: suggest sequencer
c
omma
n
ds for revert
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Ste
f
an Beller
glossary: add "remote", "submodule", "superproj
e
ct"
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next