repo.or.cz
/
alt-git.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
ewren
t60
4
2:
A
dd faili
n
g testcase for rename/mo
d
ify/a
d
d-source
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6
0
42
:
Add a test
c
a
se where git deletes an untracked
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-09
J
i
m Mey
e
r
i
ng
f
et
c
h: do not leak
a
refspec
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-01
Junio
C Hamano
Git 1
.
7
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Merge b
r
anch 'jk/maint-confi
g
-alias-fix' into
m
aint
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
M
e
rge branch 'jc/fmt-req
-
fix' in
t
o maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C
H
ama
n
o
Me
r
ge branch
'
jk/maint-docs' into ma
i
nt
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Merge branch '
j
n/doc-remote-helpers'
i
nto
m
ai
n
t
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Merge branch 'kk/maint-prefix-in-config-mak' into maint
commit
|
commitdiff
|
tree
2011-06-01
Jim Meyering
d
iffcor
e
-rename
.
c: avoi
d
set-but-
n
ot
-
use
d
war
n
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hama
n
o
Start 1
.
7
.
5
.
4
dra
f
t release
n
o
tes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Junio C
Hamano
Merge bran
c
h 'tr/
a
d
d
-i
-
no-escape' into maint
commit
|
commitdiff
|
tree
2011-05-31
Juni
o
C Hamano
M
e
rge branch 'vh
/
con
f
ig-int
e
ractive-sing
l
e
k
e
y
-doc'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
Junio C Ha
m
ano
Merg
e
branch 'ml/test-readme' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-31
Jun
i
o C Haman
o
M
e
r
g
e
b
r
a
nch 'ab/i18n-fixu
p
' i
n
t
o m
a
int
commit
|
commitdiff
|
tree
2011-05-31
Junio C
Hamano
M
e
rge
b
ranch 'jc/rename-degrade-cc-to-
c
' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
M
e
r
ge branch 'rr/doc-content-type' into
maint
commit
|
commitdiff
|
tree
2011-05-30
J
onath
a
n Nie
d
er
Document
a
t
i
on
:
do not
misinterpret r
e
f
s
pec
s
as bol
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-30
J
u
ni
o
C Hamano
M
e
rge branch 'j
m
/maint-mi
s
c-fix
'
into ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-30
Juni
o
C
Hamano
Merge br
a
nch 'bc/maint
-
sub
m
o
d
u
le-
f
ix-parked' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
Merge branch 'bc
/
maint-ap
i
-doc-parke
d
'
into maint
commit
|
commitdiff
|
tree
2011-05-30
Junio C
H
aman
o
Merg
e
bra
n
c
h
'jn/run
-
command-error-fa
i
lure'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-27
J
unio C Hamano
config
.
mak
.
in:
allow
"
c
o
nfigure --sys
c
o
nfdir=/
e
lse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff Ki
n
g
d
o
c
s: fi
x
some antique example
o
utput
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff
King
docs: make
s
ure li
t
er
a
l "->" isn't co
n
verted to a
r
row
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
J
e
ff King
do
c
s: update status
--porcela
i
n format
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
d
ocs: minor grammar fixes to git-status
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Br
a
ndon Casey
git-submo
d
ule
.
sh: separat
e
parens
b
y a space to
a
void
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Bra
n
do
n
Cas
e
y
Documentation
/
t
e
c
hnical/
a
pi-diff
.
txt: cor
r
e
ct
n
a
m
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
J
e
f
f K
i
ng
rea
d
_gitfile_gently: us
e
ss
i
ze_t to hold read result
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jim Meyering
r
e
move tests of always-false condition
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
J
i
m Meyer
i
ng
rer
e
re
.
c
:
diagnose a
c
orrupt M
E
R
G
E_RR when
hitt
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Junio C
Ha
m
ano
Git
1
.
7
.
5
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Junio C H
a
mano
Merg
e
branch
'
m
a
int-1
.
7
.
4' into
m
aint
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o
C Hama
n
o
Merge branch 'jk/git-c
o
nnectio
n
-
d
eadlock-f
i
x'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio
C H
a
mano
Merge bran
c
h '
j
s/maint-send-pa
c
k-stateless-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Ham
a
no
Merg
e
branch 'jk/
m
aint-upload-pack-
s
ha
l
low' i
n
to maint
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merg
e
branch 'jm/maint-d
i
ff-words-w
i
th-sbe' into
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ham
a
no
Merge
b
r
anch 'kk/ma
i
nt-prefi
x
-in-
c
onfig-mak' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge br
a
nch 'm
g
/diff-uiconfig-do
c
'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Hamano
Merge branch 'ft/gitweb-tar-with-gzip
-
n' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Hamano
Mer
g
e b
r
a
n
ch
'
ss/doc-svn'
into maint
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Hamano
Merge branch 'jn/f
o
rmat-
p
atch
-
doc' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C Hamano
Merge br
a
nch
'jc/maint
-
path
s
pec-stdin-and-cmdline'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Ham
a
no
Merge
branch 'jk/cherry-pick-
r
oot-wi
t
h
-
re
s
olv
e
' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge
b
ranch 'rg/copy-gecos-us
e
rname' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge br
a
nch 'fc/
c
ompletion
-
zsh' into
m
a
int
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C
H
a
m
a
no
Merge bran
c
h 'jk/git-co
n
necti
o
n-deadlock-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ham
a
no
Merge
branch 'js/mai
n
t
-
send-pack-
s
t
a
te
l
e
ss-rpc-d
e
adlo
c
k
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
an
o
Mer
g
e branch 's
v
n
-fe-maint' of gi
t
://repo
.
or
.
cz/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Junio C Hamano
u
s
erformat
_
find_requir
e
ments
(
):
f
ind requirement for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-25
Nguyen
T
hai Ngoc Duy
i
n
it/clone: remove short
o
ption -L and doc
u
ment --separate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Jun
i
o C Ha
m
ano
ha
n
dle_options(): d
o
not miscount how
m
any arguments
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
config: alw
a
ys pa
r
se GIT_CO
N
FIG_PA
R
AMETERS
during git_conf
i
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
git_confi
g
: don'
t
peek at g
l
obal
config_para
m
eters
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Jeff
King
c
onfi
g
: make
e
nvir
o
nment parsing routines s
t
a
t
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jim
Me
y
e
r
ing
do
not read bey
o
nd end of mal
l
o
c'd buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Mich
a
el J Gruber
g
it-svn: Fix gi
t
s
v
n
log -
-
show
-
commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
J
u
nio C Haman
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
provide a copy of the LGP
L
v2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Jeff King
tes
t
co
r
e
.
gitproxy c
o
nfigura
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Rafael
Gieschke
c
o
py_gecos: fix not addin
g
nlen to
l
e
n
when proces
s
ing "&"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Th
o
mas
Rast
ad
d
-i: ignore terminal escap
e
se
q
uenc
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Junio C Hamano
Merge branch
'
js/maint-1
.
6
.
6-s
e
nd-pack-stateless-r
p
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
Up
d
ate draft
re
l
ease notes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merg
e
branch 'jn/maint-f
o
rmat-patch-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merg
e
branch '
s
s/
c
her
r
y-pick-x-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Merge br
a
nch 'vr/merge-base-d
o
c
' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C
Hamano
M
erge br
a
nch 'sr/maint-
f
ast-impor
t
-tigh
t
en-op
t
ion-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Hamano
Merge b
r
an
c
h
'j
c
/t1506-shell-param-expansion-g
o
tcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merg
e
b
r
anc
h
'j
c
/fix-add
-
u-unmerge
d
'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C
Ham
a
n
o
Mer
g
e branch 'jn/
g
itw
e
b-dependency' into maint
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
M
e
r
g
e branch '
j
c/m
a
i
n
t
-bran
c
h
-mergeoptio
n
s
' into main
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Haman
o
Merge
b
r
a
nch
'
jc/main
t
-a
d
d
-p-ov
e
rlap
p
ing-hu
n
k
s' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Me
y
ering
Document
a
tion/git-fsck
.
txt: f
i
x
typ
o
:
u
nreadable -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
send-pack
:
avoid deadlock o
n
gi
t
:// push with fa
i
led
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
connect:
l
et callers know if
c
onne
c
tion
i
s a socket
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
e
ff King
c
onnect: treat generic pr
o
xy
p
rocesse
s
like ss
h
pr
o
cesses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Haman
o
sideband_demux(): fix d
e
cl-after-stmt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
eff King
t3503: test cherry picking and reverting root commits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
revert:
allow reverti
n
g a root commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jef
f
King
ch
e
r
r
y-pick: handl
e
r
oot c
o
mmits w
i
t
h
e
x
ternal strategies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
unio C
Haman
o
Update draft
release
no
t
e
s
t
o 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Hamano
Merge branch 'cn
/
format-patch-
q
u
iet' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Ha
m
ano
M
e
rge branch 'jm/mergetool-submodules
'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
amano
Merge branch 'j
k
/format
-
patch-
q
uote-specia
l
-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
H
a
man
o
M
e
rge bran
c
h 'vh/gi
t
-svn-doc' int
o
maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
ano
g
i
t
_open_noati
m
e():
drop
u
nused para
m
e
ter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
sh
a
1_file:
t
y
p
ofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jonathan Nieder
add, merge, diff: do not us
e
st
r
casecmp to co
m
p
a
re
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C
H
aman
o
Prepare for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge
b
ra
n
c
h
'aw/mai
n
t
-
rebase-i-p-no-ff
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
M
erge bran
c
h 'js/blam
e
-parsename' into
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Haman
o
Me
r
ge branch '
g
r/cvsimp
o
r
t
-
a
lternative-cvspass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hamano
Merg
e
b
ranch 'cj
/
p4merge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
i
o
C
Hamano
Merge branch '
j
k/m
e
rge-
o
n
e
-file-working-tree' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Haman
o
Merg
e
branch
'
jc/fix
-
diff-fil
e
s-unmerged
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o
C H
a
mano
Me
r
ge branch 'mz/maint-ren
a
me-un
m
erg
e
d' into maint
commit
|
commitdiff
|
tree
2011-05-13
J
ohan Herl
a
nd
t
5
400: Fix a couple of typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ham
a
no
Merge branch 'jc/maint-1
.
7
.
4-paths
p
ec-stdin-a
n
d
-cm
d
line
'
commit
|
commitdiff
|
tree
next