repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'mg/config-symbolic-constants'
2011-05-23
Junio C
H
a
m
ano
Mer
g
e br
a
nc
h
'mg/config
-
symbol
i
c
-
consta
n
t
s'
commit
|
commitdiff
|
tree
2011-05-23
Junio C Hamano
Merge
b
ranch 'ab/i18n-scripts-basic'
commit
|
commitdiff
|
tree
2011-05-23
Junio C Hamano
Merge branch 'jc/m
a
gic
-
pathspec'
commit
|
commitdiff
|
tree
2011-05-23
Junio C H
a
man
o
Mer
g
e
branch 'jk/blame-line-p
o
rc
e
lain'
commit
|
commitdiff
|
tree
2011-05-21
Juni
o
C Ha
m
ano
M
e
rge br
a
n
c
h
'
maint'
commit
|
commitdiff
|
tree
2011-05-20
Michael J Gru
b
er
git-s
v
n: Fix git svn log --
s
how
-
co
m
mit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Juni
o
C Ham
a
no
Update draft release notes to
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
J
unio C Hamano
Me
r
ge bran
c
h 'jc/maint-1
.
7
.
4-pathspec-stdin-
a
nd-cmdline'
commit
|
commitdiff
|
tree
2011-05-20
Junio C
Hamano
Me
r
ge b
r
anch 'rg/copy-gecos-userna
m
e
'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Ha
m
ano
Merge branch
'jl/sub
m
odule-co
n
flicted-git
m
odules'
commit
|
commitdiff
|
tree
2011-05-20
Juni
o
C Hamano
Merge br
a
n
c
h 'jc/replaci
n
g'
commit
|
commitdiff
|
tree
2011-05-20
Juni
o
C Hamano
Merge bran
c
h 'nd/sp
a
r
s
e-c
o
-fi
x
'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
M
e
rge branch 'l
d
/
p4-preserve-user-names'
commit
|
commitdiff
|
tree
2011-05-20
Junio C
Hamano
Merge
b
ranch
'
m
s
/tagname-does-not-begi
n
-wi
t
h-
d
ash'
commit
|
commitdiff
|
tree
2011-05-20
Jun
i
o C Hamano
Merge br
a
nch
'jk/git-connec
t
i
o
n-dea
d
l
o
ck-fix'
commit
|
commitdiff
|
tree
2011-05-20
J
u
n
i
o C
H
a
mano
Merge br
a
n
c
h 'js/maint-send-pack-
s
tateless-rpc-dead
l
oc
k
.
.
.
commit
|
commitdiff
|
tree
2011-05-20
Ju
n
io
C Hamano
Merge bra
n
c
h
'j
k
/cherry-pic
k
-root-with-resolve'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Merge bra
n
ch 'j
c
/maint-pathspec
-
stdi
n
-and-cmd
l
ine'
commit
|
commitdiff
|
tree
2011-05-20
Junio C H
a
mano
Merge 1
.
7
.
5
.
2 in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Junio C H
a
mano
R
evert "Merge branch 'en/merge-
r
e
c
ursive'"
commit
|
commitdiff
|
tree
2011-05-20
Junio C
H
a
m
ano
Git
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
J
eff King
Makefile
:
so
r
t TEST_PROGRAMS l
i
st
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jona
t
han Nieder
provide
a
c
opy of t
h
e LGPLv2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
J
e
ff
K
ing
test core
.
gitproxy co
n
figu
r
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
R
a
fae
l
Gieschke
copy_gec
o
s: fix not add
i
ng nlen to len when proce
s
sing
"&"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Ramsay Jones
s
etu
p
.
c: Fix
some "symbol not
decla
r
ed" sparse warnings
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Michael
J Grub
e
r
c
onfig
:
Giv
e
error messag
e
wh
e
n not
changi
n
g a m
u
ltivar
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
M
i
chael
J Gruber
c
o
n
f
ig:
define and
document exi
t
c
ode
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Junio C Ha
m
ano
Update r
e
l
e
ase notes to
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Junio C
Haman
o
Merge
b
ranch
'
js/m
a
i
n
t-1
.
6
.
6-send-pa
c
k
-st
a
teless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
Merge branch
'
jc
/
conv
e
rt'
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
M
erg
e
branch 'ci/commit--in
t
e
r
active-ato
m
ic'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
erge bra
n
ch
'sg/
c
o
mpl
e
tion-updates'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Me
r
ge branch 'k
k
/mai
n
t-prefix-in-config-
m
ak'
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
M
e
rge b
r
anch 'mg/merge-ff-co
n
fig'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
a
n
o
Update draft
release notes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hama
n
o
Mer
g
e br
a
nch 'jn
/
maint-format-pa
t
c
h-d
o
c'
i
nto m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
M
erge
b
r
a
nch 'ss/cherry-pic
k
-x-doc'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merge branch 'vr/merge-
b
ase-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hamano
Mer
g
e branch 'sr/
m
aint-f
a
s
t
-import-tighten-option-par
s
ing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Merge
b
ranc
h
'jc/t1506-shell-param-expansio
n
-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
Merge b
r
anch
'jc/
f
ix-a
d
d
-u-unmerged
'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge bra
n
ch 'jn/gi
t
web-d
e
penden
c
y' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merge branch 'jc/ma
i
n
t-
b
ranch-merg
e
options' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Haman
o
Merge branch
'jc/maint-a
d
d-
p
-overlapping-hunks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Ji
m
M
eyering
D
o
cu
m
entation/git-fsck
.
txt:
fi
x
t
y
po: unreadab
l
e
-
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
e
f
f Ki
n
g
sen
d
-
pack: avoid deadlock on git:// push with fail
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff
King
conne
c
t:
let callers know
if connection is a socket
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff
Ki
n
g
connect: treat generi
c
proxy process
e
s
like s
s
h proce
s
ses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hamano
sideband_demux()
:
f
ix decl-aft
e
r-stmt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff K
i
n
g
t3503: test cherry pic
k
ing and r
e
ver
t
ing roo
t
commits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
eff Ki
n
g
revert: allow reve
r
ting a root comm
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff Kin
g
che
r
ry-pi
c
k
:
hand
l
e root commit
s
wi
t
h external st
r
ategie
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
n
o
Sync release notes for 1
.
7
.
6
t
o
exclude what
a
re in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hamano
Mer
g
e branch
'maint
'
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o
C
Hamano
Update draft release notes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Haman
o
Merge branch 'cn/fo
r
mat-patch-qui
e
t' int
o
maint
commit
|
commitdiff
|
tree
2011-05-15
J
u
n
io
C
Hamano
M
e
r
g
e branch 'jm
/
mergetool-submodules' into
m
a
int
commit
|
commitdiff
|
tree
2011-05-15
J
unio C Hamano
Merge bran
c
h 'jk/format-patch-qu
o
te-specia
l
-in-f
r
om
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io
C Hamano
Merge branch 'vh/git-svn-doc' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
amano
g
i
t_open_noatime():
drop unused parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Ham
a
no
sha1_
f
i
le: typ
o
fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
read_sha1_file(): a
l
low s
e
lective bypassi
n
g of replace
m
e
nt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
inl
i
ne lookup_replac
e
_object
(
) calls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Ha
m
ano
read_sha1_fil
e
(): get ri
d
o
f
read
_
sha1_file_r
e
pl(
)
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Haman
o
t6050:
m
ake sure we tes
t
not just c
o
mmit repla
c
emen
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Declare lookup
_
rep
l
ace_object
(
) in c
a
ch
e
.
h, not in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
m
ano
Merge bran
c
h 'maint
'
commit
|
commitdiff
|
tree
2011-05-15
Ævar Arnf
j
örð
Bjarmaso
n
M
a
kefile: add xget
t
ext target for *
.
sh
file
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Ævar Arnfj
ö
r
ð Bjarmason
git
-
sh-i18n
.
sh: add GIT_GETTEXT_POISON supp
o
rt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Ævar Arnfjö
r
ð B
j
a
rma
s
on
gi
t
-s
h
-i18n
.
sh:
add
no-op get
t
ext()
and eval_gette
x
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Æva
r
Arn
f
j
ö
r
ð Bjarmason
git
-
s
h
-i18n-
-
en
v
subst:
o
ur own env
s
ub
s
t
(
1) for
e
val_gettext()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
o
nat
h
a
n
N
i
e
d
er
a
d
d, merge
,
d
iff: do not use strcasecmp to
c
ompare
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-14
Jens L
e
hmann
S
ubm
o
dules: Don't parse
.
gitmodules
whe
n
i
t
contains
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-14
Heiko Voigt
test that git statu
s
works w
i
th
m
erge
conflict
i
n,
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Luke Di
a
mand
git-p
4
: warn if g
i
t authorship
won't be retained
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Upda
t
e
d
r
aft release notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge bra
n
ch 'bf/commit-te
m
plate-
n
o-cle
a
nup
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
er
g
e b
r
anch 'jc
/
t1506-s
h
el
l
-param
-
ex
p
ansion
-
gotcha
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
M
erge branch 'rr/rerere-libify-clear-gc'
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Merge branch 'js/maint-send-pack-stateless-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
unio
C Hamano
Merge branch 'jh/dirst
a
t-lines'
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
Merge branch 'jc/fix-ad
d
-
u-unmerged'
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Merge
b
ranch 'jn/setup-revisions-gl
o
b-an
d
-
f
riends-passthru'
commit
|
commitdiff
|
tree
2011-05-13
J
u
ni
o
C H
a
ma
n
o
Merge br
a
n
ch 'cn/log-pa
r
se-opt'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
erge b
r
anch
'
m
aint
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
P
r
epare for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Haman
o
Mer
g
e branch 'aw
/
m
aint
-
rebase-i-p-no-
f
f' into maint
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio
C
H
amano
Merge br
a
nch
'js/
b
lame
-
parsename' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Hamano
Merge br
a
nch 'g
r
/cvsimport-a
l
t
ernati
v
e-cvsp
a
ss-l
o
cation
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
a
no
Mer
g
e
branch 'cj/
p
4merge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
am
a
no
Merg
e
branch
'
jk/merge-o
n
e-fi
l
e-wo
r
kin
g
-tree'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
rg
e
branch
'
jc/fix-diff-files-unmerged' into
maint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
i
o
C Hamano
M
erge branch 'mz/maint-rename-unme
r
ged' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Johan H
e
rland
t
5400:
Fix a coup
l
e of typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branc
h
'nd
/
struct-pat
h
s
p
ec'
commit
|
commitdiff
|
tree
2011-05-13
Joh
a
n
nes Sixt
Twea
k
t3102-ls-tree-wi
l
dcard
s
to run
o
n Win
d
ows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Johannes Sixt
t3703:
S
kip tes
t
s using directory
name ":" o
n
W
i
ndo
w
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Junio
C
Hamano
Merge b
r
an
c
h 'jc/maint-1
.
7
.
4-pathsp
e
c-s
t
di
n
-and-cmdl
i
ne'
commit
|
commitdiff
|
tree
next