repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
rerere: fix for merge.conflictstyle
2014-04-30
Felipe Contreras
r
e
rere: fix for merge
.
confli
c
t
style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-02-13
J
unio C Hamano
Git 1
.
8
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-02-13
J
un
i
o
C Hamano
Merge
branch 'bm/merge-
b
ase-octopus-de
d
up' into maint
commit
|
commitdiff
|
tree
2014-02-13
Junio C H
a
man
o
Merge br
a
n
c
h 'jc/revision-ra
n
ge
-
unpeel' into
maint
commit
|
commitdiff
|
tree
2014-02-13
Junio
C
H
amano
Merge b
r
anch 'jk/allow-fetch-
o
nelevel-
r
efname' into
.
.
.
commit
|
commitdiff
|
tree
2014-02-13
J
u
nio C
H
a
m
a
n
o
Merge bran
c
h '
j
k
/interpret-b
r
anch-na
m
e-fix' into maint
commit
|
commitdiff
|
tree
2014-02-13
Jun
i
o C Hama
n
o
M
e
rge br
a
nch 'r
k
/
s
end-emai
l
-ssl-cert' i
n
to maint
commit
|
commitdiff
|
tree
2014-02-13
Jun
i
o
C Haman
o
Me
r
ge branch 'sb/repack-in-c'
into
mai
n
t
commit
|
commitdiff
|
tree
2014-02-13
Junio C Hamano
M
e
rge b
r
anch 'a
s
/tree-walk-fix
-
aggre
s
sive-s
h
ort-cut
.
.
.
commit
|
commitdiff
|
tree
2014-02-05
Juni
o
C H
a
man
o
G
it 1
.
8
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-02-05
Ju
n
i
o
C Ha
m
ano
Me
r
ge branch '
j
c/
m
ai
n
t-pull-docfix' int
o
maint
commit
|
commitdiff
|
tree
2014-02-05
Ju
n
io C
H
amano
M
e
rge
b
ra
n
ch
'
ow/s
t
ash-with-ifs
'
into mai
n
t
commit
|
commitdiff
|
tree
2014-02-05
Junio
C
Hamano
Merge
b
r
anch 'js/l
i
ft
-
parent-c
o
unt-l
i
mit' int
o
maint
commit
|
commitdiff
|
tree
2014-02-05
Junio C Hama
n
o
M
e
rge branch 'nd/add-e
m
p
t
y
-
f
i
x' into maint
commit
|
commitdiff
|
tree
2014-02-05
J
unio C Hamano
Mer
g
e b
r
an
c
h 'bc/log-de
c
o
r
ation' into m
a
i
n
t
commit
|
commitdiff
|
tree
2014-02-05
Junio C
H
amano
Merge
branch 'jh/rlimit-
n
o
fi
l
e
-fallback' into maint
commit
|
commitdiff
|
tree
2014-02-05
Junio C Hamano
Merg
e
branc
h
'jl/c
o
mmit-v-strip-marke
r
' int
o
maint
commit
|
commitdiff
|
tree
2014-02-05
Junio
C
Hamano
Merge branch 't
r
/send-e
m
a
il-
s
sl' int
o
m
aint
commit
|
commitdiff
|
tree
2014-02-05
Junio
C
Hamano
Me
r
ge
bran
c
h 'tb/clone-ssh-
w
i
t
h-colon-for
-
po
r
t' into
.
.
.
commit
|
commitdiff
|
tree
2014-02-05
J
unio C H
a
m
ano
Merge bra
n
ch 'nd/transport-positive-depth
-
only' into
.
.
.
commit
|
commitdiff
|
tree
2014-01-27
An
d
y
Spenc
e
r
tree_entry_interestin
g
: match against all pathspecs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-01-23
Jeff King
repack: propagate pack-objects opti
o
ns
a
s
s
trings
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-01-23
Je
f
f
King
r
e
pack: make
p
a
r
s
ed string option
s
const-correct
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-01-23
Jeff King
repack:
fix typo in ma
x
-pack-size option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-01-17
Roman
K
agan
g
i
t
-
s
v
n: workarou
n
d
for a bug i
n
s
vn s
e
rf backend
commit
|
commitdiff
|
tree
2014-01-16
Ruben Ker
k
hof
s
end
-
e
mail: /etc/ssl/certs/ directory
may
n
o
t
b
e usable
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-01-15
J
u
nio
C
Hamano
revision: propagate
flag bits
f
rom t
a
gs
to
p
ointees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-01-15
Jun
i
o
C
Hamano
r
evision: mark contents of
an uninteresting
tree
uninte
r
esting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-01-15
Jeff King
interpre
t
_
b
ranch_name: find
a
ll possibl
e
@-marks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-01-15
Jeff
Ki
n
g
interpret_br
a
nch_name:
a
void @{u
p
stream} past c
o
lon
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-01-15
Jeff
King
interpret_branch_name: always respect "namelen" paramet
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-01-15
J
e
ff King
interpret_br
a
nch_
n
ame:
rename "cp" variable to "at"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-01-15
Jeff King
interpret_branch_name: factor ou
t
upstream handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-01-15
Jeff King
fetch
-
pack: d
o
not filt
e
r o
u
t one-
l
evel refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-01-14
Ju
n
io C H
a
mano
Doc
u
mentation: "git pull" does not have the "-m
"
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-01-14
Junio C H
a
m
a
no
Merge bran
c
h 'jc/mai
n
t-
p
ull-d
o
cfi
x
-f
o
r-409b8d82' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2014-01-14
Ju
n
io C
H
a
mano
Docum
e
ntat
i
on: ex
c
lude irrele
v
ant
o
ptions f
r
o
m
"git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-01-13
Juni
o
C H
a
ma
n
o
Git 1
.
8
.
5
.
3
commit
|
commitdiff
|
tree
2014-01-13
Juni
o
C H
a
mano
Me
r
g
e br
a
nc
h
'
nd/d
a
emon-informative-errors-typofix
.
.
.
commit
|
commitdiff
|
tree
2014-01-13
Ju
n
io C Haman
o
M
erge branch 'km/gc-epe
r
m' int
o
m
aint
commit
|
commitdiff
|
tree
2014-01-13
J
u
nio C
Hamano
Merge
b
r
a
nch 'jk/
c
redential-plu
g
-le
a
k'
i
nto maint
commit
|
commitdiff
|
tree
2014-01-13
Juni
o
C Ha
m
a
n
o
Merge
branch 'mm/m
v
-
f
ile-to-no-such-di
r
-with-
s
lash
.
.
.
commit
|
commitdiff
|
tree
2014-01-13
J
u
nio C
Hamano
Merge branch
'jk/rev-parse-dou
b
le-dashes' into maint
commit
|
commitdiff
|
tree
2014-01-13
Junio C Hamano
Merge b
r
anch '
j
k/ca
t
-file-r
e
g
r
ession-fix' into
m
aint
commit
|
commitdiff
|
tree
2014-01-13
Thom
a
s Ackermann
pack-h
e
uristics
.
txt: mark up the file header
p
r
o
perly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-01-10
Joh
a
nnes
Si
x
t
mv: let
'git mv
f
i
le no-such-dir/'
e
rr
o
r out on Windows
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-01-07
Øystein Walle
stash: handle s
p
ecifying
stash
e
s
wit
h
$IFS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-01-06
J
unio C Hama
n
o
Merge bra
n
c
h 'maint
'
of git:
/
/github
.
com/git-l10
n
/git
.
.
.
commit
|
commitdiff
|
tree
2014-01-06
W
.
Trevor
King
D
ocumentation/gitm
o
dules: Only '
u
pdate'
a
nd 'url' are
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-01-03
Kyle J
.
McKay
gc: noti
c
e gc processes ru
n
by
o
ther use
r
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-01-02
Jeff King
Reve
r
t "p
r
o
m
pt: clean u
p
s
trbuf usage"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-30
Ramkumar Ramachandra
for-each-ref: remov
e
unused variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-30
Ju
n
io C Hamano
merg
e
-base --octopus: r
e
duce the
result f
r
o
m get_oc
t
o
pus_mer
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-30
Jun
i
o C Hamano
merge
-
base: se
p
arate "-
-
independent" codepath into
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-28
Johan
n
es
Sch
i
ndelin
Remove the line
l
e
ngth limit for graft files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-26
Nguyễn Thái
Ngọc Du
y
add: don't complain when adding empty project
root
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-20
brian m
.
c
arlso
n
log: pro
p
erly handle decora
t
ions
wit
h
chained tags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-20
Ng
u
yễn Thái Ngọc Duy
daemon: be strict at
p
a
r
s
ing par
a
m
e
ters
--[
n
o
-]informative
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-18
Junio C Ha
m
ano
get
_
max_fd_limit(
)
: fall
b
a
c
k
to OPEN_MAX upo
n
getrlimit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-17
Junio C Ha
m
ano
Git
1
.
8
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-17
Junio C Ha
m
ano
M
e
rge branch 'rs/doc-submitting-p
a
tches'
i
nto maint
commit
|
commitdiff
|
tree
2013-12-17
Jun
i
o C
H
amano
Me
r
ge branch 'tr
/
doc-git-
c
herry' into
m
ain
t
commit
|
commitdiff
|
tree
2013-12-17
J
unio
C Hamano
M
erge b
r
anch 'nd/glossary
-
content
-
pathspec-markup'
.
.
.
commit
|
commitdiff
|
tree
2013-12-17
Junio
C
H
a
mano
Merge branch 'jj/doc-markup-gi
t
c
li'
into maint
commit
|
commitdiff
|
tree
2013-12-17
Junio C H
a
man
o
Merge
b
r
anch 'jj/doc
-
markup-hints-in-co
d
ing-guidel
i
nes
.
.
.
commit
|
commitdiff
|
tree
2013-12-17
Junio C Hamano
Merge branch 'jj/l
o
g-
d
o
c' into maint
commit
|
commitdiff
|
tree
2013-12-17
Junio C Hamano
Merge
b
r
an
c
h 'jj/rev-list-op
t
ions-doc' into maint
commit
|
commitdiff
|
tree
2013-12-17
Ju
n
io C
H
a
mano
M
erge branch 'tb/d
o
c-fetch-pack-url' into maint
commit
|
commitdiff
|
tree
2013-12-17
Junio C Hama
n
o
Merge branch 'mi/typofixes' i
n
to maint
commit
|
commitdiff
|
tree
2013-12-17
Junio
C
Hamano
Me
r
ge
branch 'jh
/
loose
-
o
b
je
c
t-
d
i
rs-c
r
eation-race' into
.
.
.
commit
|
commitdiff
|
tree
2013-12-17
Junio
C Hamano
Merg
e
b
ran
c
h 'jk/two
-
way-merge-
c
orne
r
-case-fix' into
.
.
.
commit
|
commitdiff
|
tree
2013-12-17
Junio C Ha
m
a
no
Merge branch 'sb/s
h
a1-l
o
o
se-object-info-c
h
eck-e
x
iste
n
ce
.
.
.
commit
|
commitdiff
|
tree
2013-12-17
Junio C
H
ama
n
o
Merge bra
n
ch 'nd/magic-p
a
thspec' into maint
commit
|
commitdiff
|
tree
2013-12-17
Mic
h
ael Haggert
y
cmd_repack(): remove
redund
a
n
t local variab
l
e
"nr_packs"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-12
J
e
f
f King
cat-file: handle -
-
batch for
m
at wi
t
h missing type/s
i
ze
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-12
Jeff
K
i
ng
cat-file: pass
expand_data to print
_
obje
c
t_or_
d
ie
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-09
Torsten Bögershause
n
git
_
c
o
nnect()
:
u
s
e common retu
r
n
point
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-09
Torsten Bögershausen
connect
.
c: re
f
actor url pa
r
sing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-09
Torsten Bögers
h
au
s
en
git_
c
onn
e
ct()
:
r
e
factor the port
ha
n
dl
i
ng for ssh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-09
To
r
ste
n
Böge
r
shausen
gi
t
fetch: support ho
s
t:/~r
e
po
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-09
Torst
e
n B
ö
gershausen
t
5
500: add t
e
st c
a
ses for diag-url
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-09
T
orsten Bögershausen
git f
e
tch-pack:
add
-
-d
i
ag-url
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-09
Johannes Sixt
git_
c
onnect:
factor
o
ut discovery of the protocol and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-09
J
o
h
annes Sixt
git_connect:
remove
artifici
a
l limit of a
remote c
o
m
m
and
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-09
Jeff King
rev-parse: be
m
o
re careful
w
ith
munging
a
rgu
m
ents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-09
Jeff King
rev-p
a
rs
e
:
co
r
rectly
d
iagno
s
e
r
e
vision erro
r
s before
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-06
Nguy
ễ
n T
h
á
i
Ngọc
D
uy
clo
n
e,fetch: cat
c
h non pos
i
tiv
e
--d
e
pth
o
pti
o
n val
u
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-05
Je
n
s
L
ehmann
commit
-v: s
t
r
i
p diffs
a
nd sub
m
o
d
u
l
e shortlogs from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-04
Torst
e
n Bö
g
ershau
s
en
t
5
601: add tests for ssh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-04
Torsten Böger
s
hausen
t5601:
r
emo
v
e
clear_ssh
,
refact
o
r setup_s
s
h_w
r
apper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-04
M
atthieu Moy
mv:
let 'git mv file no-s
u
ch-
d
ir/'
error
o
u
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-04
Thomas Rast
s
e
nd-email: set
S
SL
o
p
t
ions t
h
rough IO:
:
Soc
k
et::
S
SL
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-04
T
ho
m
a
s
Ras
t
sen
d
-em
a
il:
--smtp-ssl-cert-path ta
k
es
an arg
u
m
ent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-04
Thomas Rast
send-e
m
a
i
l: pass Debug to Net::SMTP
:
:
S
SL::new
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-03
J
u
n
i
o C
H
aman
o
Git
1
.
8
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-03
Nick T
o
wnsend
r
e
f
-iteration doc: ad
d
_submodule_odb() returns 0
f
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-02
Junio C Hamano
S
y
nc with 1
.
8
.
4
.
5
commit
|
commitdiff
|
tree
2013-12-02
J
u
ni
o
C Ha
m
ano
Git 1
.
8
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-02
Jun
i
o C Hamano
submodule:
do not
c
opy unknown update
mode from
.
gitmodul
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-11-27
Thomas
Rast
Docum
e
n
t
atio
n
: revamp git-ch
e
rry(1)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next