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
t6042: Add failing testcase for rename/modify/add-source conflict
2011-08-14
Elijah
N
e
w
ren
t6042
:
Add
failin
g
testcase for rename/modi
f
y/add-source
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah
Newren
t
6
0
42: Ad
d
a
t
e
stcase where g
i
t
d
e
letes an untracked
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-09
Jim Meye
r
ing
fetch: do n
o
t leak a refsp
e
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-01
Ju
n
io C Hamano
G
i
t 1
.
7
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-01
Junio C H
a
mano
Merge
br
a
n
c
h 'jk/maint-
c
onfi
g
-alia
s
-fix' into maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
M
e
r
g
e
branch 'jc/fmt-req
-
fix'
int
o
maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Merge bran
c
h
'
j
k/maint
-
docs' into maint
commit
|
commitdiff
|
tree
2011-06-01
Ju
n
i
o C Hamano
Merg
e
b
ranch 'jn
/
do
c
-remote-help
e
r
s
' into
m
a
in
t
commit
|
commitdiff
|
tree
2011-06-01
Juni
o
C
Ha
m
a
n
o
Merge bran
c
h 'kk/maint-prefix-in-config
-
mak'
into maint
commit
|
commitdiff
|
tree
2011-06-01
Ji
m
Meyering
diffcore-rena
m
e
.
c: avoid set-but-not-used w
a
rning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Start 1
.
7
.
5
.
4 draft release notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-31
Ju
n
i
o C Hamano
M
e
rge
branch 'tr/a
d
d
-i-no-escape' into maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C Ha
m
a
no
Merge bra
n
c
h 'vh/confi
g
-i
n
te
r
ac
t
ive-sing
l
ekey-doc'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merge
bran
c
h 'ml/test-readme'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-31
Junio
C
Hama
n
o
M
erge bra
n
ch '
a
b/i18n-fix
u
p
'
into maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Mer
g
e br
a
nch
'
jc/renam
e
-degrade
-
c
c
-to-c'
in
t
o
main
t
commit
|
commitdiff
|
tree
2011-05-31
Junio C
H
amano
Me
r
g
e branch 'rr/doc-content-type
'
into maint
commit
|
commitdiff
|
tree
2011-05-30
Jonathan Niede
r
Documentation:
d
o not misinterpret refspecs as bol
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-30
Jun
i
o C H
a
mano
Merge branch 'jm/maint-
m
isc-fix'
i
n
t
o m
a
int
commit
|
commitdiff
|
tree
2011-05-30
Junio
C Ham
a
n
o
Merge branch 'bc/maint-sub
m
odule-fix-parked'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-30
Junio C Ham
a
no
Merge branch 'bc/maint-api-doc-par
k
ed' into
mai
n
t
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
Merge branch '
j
n/run-command-e
r
ror-failure'
i
nto
maint
commit
|
commitdiff
|
tree
2011-05-27
Junio C Hamano
conf
i
g
.
mak
.
i
n
: allow "configure --sysconf
d
ir=/else
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff
K
ing
d
ocs
:
fix so
m
e antique exam
p
le output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs: make sure lite
r
al "->"
i
s
n't convert
e
d to arrow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs: upda
t
e
status
--
p
orcelain
form
a
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff
King
docs:
min
o
r grammar
fi
x
e
s
to
g
it-s
t
atu
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Brandon
Casey
git-submodule
.
sh:
s
epa
r
ate parens by a s
p
a
c
e
t
o
avoid
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Brandon Case
y
Doc
u
menta
t
ion/technical/api-di
f
f
.
txt: c
o
r
re
c
t name
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jeff Ki
n
g
read_gitfile_gently: use ssiz
e
_t t
o
hold read res
u
lt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
J
im Meyering
r
emove
t
e
s
ts
of always-false cond
i
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jim Me
y
e
r
ing
r
e
rere
.
c: diagnose a corrupt MERGE_RR
w
hen hitting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ham
a
no
Git 1
.
7
.
5
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Hama
n
o
M
er
g
e branch 'maint-1
.
7
.
4' i
n
to main
t
commit
|
commitdiff
|
tree
2011-05-26
J
unio C Hamano
Merge branch 'j
k
/git-connection-d
e
a
dlo
c
k-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C Ha
m
ano
Merg
e
bra
n
ch 'js/maint-s
e
nd-pack-stateless-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Hamano
Merge
branch 'jk/maint-u
p
load-pack
-
sha
l
low'
into mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
amano
M
erge bra
n
ch 'jm/maint-diff
-
words-with-sb
e
' into maint
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C Hama
n
o
M
e
rge bran
c
h 'kk/maint-prefix-in-c
o
nfig-mak' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
a
m
ano
Merg
e
branch 'mg/diff-uiconfig-doc' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C Hamano
Merge b
r
anch '
f
t/gitweb-tar-with-gzip
-
n' int
o
maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge
b
r
anch '
s
s/do
c
-
svn' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
i
o
C Hamano
Merge bran
c
h 'jn/fo
r
m
at-
p
a
t
ch-doc' int
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'jc/maint-p
a
th
s
pec-
s
tdi
n
-a
n
d
-cm
d
l
in
e
'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
u
ni
o
C Haman
o
Merge branch 'jk/cherry-pick-root-wi
t
h-resolve'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
unio C Hamano
M
e
rge branch 'rg/copy-gecos
-
us
e
rname' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Ham
a
no
Merge bran
c
h 'fc/compl
e
tion-zsh' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
am
a
n
o
Merge branc
h
'jk/git-conn
e
ction-deadlock-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C
Hamano
M
e
rge
branch 'j
s
/m
a
int-send-pack
-
state
l
e
s
s
-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Ha
m
an
o
Me
r
ge branch 's
v
n-fe-m
a
int
'
of git://repo
.
or
.
c
z
/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
J
u
nio
C
Hamano
user
f
ormat_f
i
nd_requi
r
ements():
f
ind r
e
quirem
e
nt f
o
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-25
Nguyen Thai
Ngoc Duy
init/clone:
r
emove short op
t
io
n
-L
and do
c
ument --
s
e
p
arate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-24
Junio C Hama
n
o
handle_options():
do not m
i
sco
u
nt how many argumen
t
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-24
J
e
ff
King
config: always par
s
e GIT_CONFIG_PARAMET
E
RS
d
uring g
i
t_con
f
i
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
gi
t
_
config: don't peek at gl
o
bal
config_parameters
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-24
Jef
f
K
ing
con
f
ig: make env
i
ronment parsing routines
s
tatic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
J
im Meyering
do not
r
e
ad be
y
o
n
d en
d
of malloc'd
b
uffer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Michael J Gruber
gi
t
-svn: F
i
x git svn lo
g
--show-c
o
mmit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hama
n
o
Git 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jo
n
athan Nieder
pro
v
i
d
e a copy of the
L
G
PLv2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Jeff King
test core
.
gitproxy confi
g
uration
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
R
a
fael Gieschke
cop
y
_gec
o
s:
f
ix not adding nlen
to len when process
i
ng
"
&
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Thomas Rast
add -i: ignore terminal
escape sequence
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
Junio C Hamano
Merge
bran
c
h 'js/m
a
int-1
.
6
.
6-send-pack-stateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
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-16
Junio C Ha
m
ano
Merge branch 'jn/mai
n
t-for
m
a
t-patch-doc' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C
H
am
a
no
Merge branch 'ss/c
h
e
r
ry-pick-x-doc'
i
n
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C Hama
n
o
Merge bran
c
h '
v
r/mer
g
e-base-doc' int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
Merge
b
ranch 'sr/maint-fa
s
t-im
p
o
r
t-t
i
ght
e
n
-
o
ption-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Ham
a
no
Merge b
r
anc
h
'jc/t1506-
s
h
ell-
p
aram-exp
a
nsion-gotch
a
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C H
a
mano
Merge br
a
nc
h
'jc/fix
-
ad
d
-u-un
m
e
r
g
ed' i
n
t
o
maint
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C
H
amano
Merge branch 'jn/gitweb-de
p
endency'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
Merge branch 'jc/maint
-
b
r
anch-
m
ergeo
p
tions
'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
M
e
rge
b
ranch
'jc/m
a
i
n
t-
a
dd-p-o
v
e
rlapping-h
u
n
k
s' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Ji
m
Meyering
Documentation/git-fsck
.
tx
t
: fix typo: unreadab
l
e -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
s
end-pack
:
a
v
oid deadlo
c
k on git:// p
u
sh with fail
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
conn
e
ct: let caller
s
k
n
ow if connection
i
s a s
o
cket
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
c
o
n
n
ect:
t
reat ge
n
e
ric proxy processes lik
e
ssh processes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
s
i
deb
a
nd_demux(): fix
de
c
l-aft
e
r-s
t
mt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
e
f
f
Ki
n
g
t
3
5
0
3
: test che
r
ry pick
i
ng a
n
d
reverting root commits
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff Ki
n
g
revert: allow revertin
g
a
r
o
ot c
o
mmit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
eff King
cherry-pick: handle
r
oot c
o
mmits with external
strategies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
mano
Update draft release
notes to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C Ham
a
no
Merge
b
ranch
'cn/f
o
rmat
-
p
atch-qui
e
t' into maint
commit
|
commitdiff
|
tree
2011-05-15
J
unio
C
H
amano
Merge b
r
a
n
ch 'jm/mergetool-subm
o
dules'
into
maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merg
e
branch
'
jk
/
format-patch
-
qu
o
t
e
-special-i
n
-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
H
amano
Merge branch 'vh/git-
s
vn-doc' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hama
n
o
git_open_noatim
e
(): drop unused parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
s
h
a1_fi
l
e: typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Jonat
h
an
Nied
e
r
add, m
e
r
g
e,
diff: do not use strcasecmp to
c
ompa
r
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Hamano
Pr
e
p
a
re for
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Haman
o
M
e
rge branch 'aw/maint-rebase
-
i
-
p
-no-ff' into m
a
in
t
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
Me
r
ge branch 'js/blame-parsename' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Merge branch 'gr/
c
v
s
impo
r
t-alternat
i
ve-cvspass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
Merge branc
h
'cj/p4m
e
rge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
m
a
no
Merge
branch '
j
k/m
e
rge-one-file-working
-
tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'jc/fix-
d
iff-files-unmerge
d
' into m
a
int
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge br
a
nch 'mz/maint-rename-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Johan
H
e
rland
t
5
400: Fix a coup
l
e of
t
ypos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge branch
'jc/maint-1
.
7
.
4-pathspec
-
stdin-and-cmdl
i
n
e
'
commit
|
commitdiff
|
tree
next