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-recursive: handle D/F conflict case more carefully.
2007-04-10
Junio C Ham
a
no
merge-recursiv
e
: ha
n
dle D/F conflict case mo
r
e carefully
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C Hamano
merge-rec
u
rsive:
do not
b
arf on
"to be removed" entri
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io
C
H
amano
T
reat D/F conflict entry more car
e
fully in unpack-tre
e
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Hamano
t1000: fix
c
ase table
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
René Sch
a
rfe
g
it-archiv
e
: make tar the defa
u
lt format
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C
Hamano
Merge branc
h
'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C Hamano
Merg
e
br
a
nch
'j
c
/merge-subtree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C Hamano
Merg
e
b
ran
c
h 'js/fetch
-
progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
Ha
m
ano
A
dd Do
c
u
mentati
o
n/cmd
-
list
.
made to
.
gitignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
E
r
i
c Wo
n
g
git-svn:
f
i
x
log command to avoid infi
n
ite lo
o
p on
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Eric Wong
git-svn:
d
commit
/
reba
s
e confused
by pat
c
hes w
i
th git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Eric
Wong
g
it
-
svn: bail out
on
i
ncorrect command-l
i
ne options
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Jun
i
o C Hamano
Start 1
.
5
.
2
cycle
b
y
p
reparei
n
g RelNotes fo
r
it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
M
e
rge b
r
anch 'j
c
/read-
t
r
ee-df'
(e
a
rl
y
part)
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io C Ham
a
no
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
J
unio
C
Hamano
Prepa
r
e for 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Frank
L
i
chtenheld
cvsserv
e
r: smal
l
co
r
r
e
ction
s
to
a
s
ciidoc documentation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ha
m
ano
A new merge stragety
'
subt
r
e
e
'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-push to multiple lo
c
a
t
ion
s
do
e
s
not stop at th
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Hamano
git-pu
s
h report
s
the URL af
t
er failing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
H
a
mano
Me
r
ge bran
c
h 'jc/index-output'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Haman
o
Merg
e
branch 'fp/
m
ake-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch 'cc/bise
c
t'
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hamano
Merge
branch 'jc/checkou
t
' (early part
)
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hama
n
o
Doc
u
ment
a
tion: tighten dependency f
o
r git
.
{html,txt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laarhoven
Makefile: iconv() on
D
arwin
has the old int
e
rfac
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arjen La
a
rhoven
t5300-pack-object
.
sh: portability
i
s
sue u
s
ing /u
s
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-
b
isec
t
: allow
bise
c
ting with only o
n
e b
a
d c
o
mm
i
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
t60
3
0
: add a bit more tests to git-bi
s
ect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laarhoven
t3200-branch
.
sh: small language
n
it
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arjen
L
a
arhoven
usermanual
.
txt: some
capitaliza
t
ion nits
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
La
r
s Hjeml
i
Make bui
l
ti
n
-branch
.
c
ha
n
d
le the
g
it config f
i
le
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Lars H
j
emli
rename_r
e
f(): on
l
y pr
i
nt a warning wh
e
n co
n
f
i
g
-
file
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Brian Gernh
a
rdt
Dis
t
i
nguis
h
branches by more than c
a
se i
n
tes
t
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Y
O
S
HIF
U
JI Hideaki
.
.
.
Avoid composing
too long "
R
efere
n
ces"
h
e
a
der
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Fran
k
Lichtenheld
cv
s
im
p
ort: Imp
r
ove for
m
atin
g
cons
i
stency
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank
Lichtenheld
cvs
i
mport
:
Reorder o
p
tions in documentation for better
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lichtenheld
c
vsimpor
t
: Impr
o
v
e us
a
g
e
error reporting
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lichtenhe
l
d
c
v
s
i
mpo
r
t: I
m
pro
v
e docu
m
entation of CVSRO
O
T and CVS
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank
L
ichtenheld
cvsimport: sync
u
sag
e
lines with
e
xisting
opti
o
n
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Junio
C
H
amano
git-bisect
:
m
oderniz
a
tion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C H
a
mano
M
e
rge
b
ranc
h
'
m
aint'
commit
|
commitdiff
|
tree
2007-04-05
Dan
a
H
o
w
Fix l
s
eek(2) calls
with
args 2 and
3
swa
p
ped
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Fernando J
.
Pereda
M
akefile: Add '
+
'
t
o QUIET_S
U
BDI
R
0 to fix parall
e
l
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Christian Couder
Doc
u
ment
a
t
i
o
n
:
bisect: "st
a
r
t
" accept
s
one
b
a
d and
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
C
h
ristian Couder
Bisect: te
a
ch "bisect
s
tart" to
o
ptionally use one
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Alex Riesen
Fix passing
of TCLTK_PATH to git
-
gui
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Hamano
R
ename add_
f
i
le_to_index() to
add_fil
e
_to_cach
e
()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hama
n
o
Re
n
a
m
e s
t
atic variable w
r
ite_index to update_index
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
R
e
name interna
l
func
t
ion "add_file_to_cach
e
" in builtin
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
H
a
man
o
Propag
a
t
e
cache
error
i
nternal
to refresh_cache() via
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Juni
o
C Hamano
F
ix bogus error mes
s
age from
m
erge
-
re
c
ursive error
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Andy Park
i
ns
Show binary
file
s
ize
change
i
n diff --stat
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Shawn O
.
P
e
arce
Hono
r
-
p<n>
w
hen applying git diffs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Hamano
Fix depe
n
dency of co
m
mon-cmds
.
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Shawn O
.
P
e
arce
Fix lost-f
o
und to show co
m
mits
o
nly re
f
erenc
e
d by reflogs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Nicolas Pitre
clean up an
d
o
p
tim
i
ze
nth_
p
acke
d
_o
b
ject_sha1() usa
g
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
G
eert Bosch
Fix renaming
br
a
n
ch witho
u
t con
f
i
g
file
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Vi
l
le
S
k
y
ttä
DE
S
TDIR support f
o
r git/c
o
ntrib/
e
macs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Jak
u
b
Nar
e
bski
gitweb:
F
ix b
u
g in "blobdi
f
f" view for split (e
.
g
.
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Brian Gernhardt
Document --
l
eft-right
o
ption to rev-list
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
René Sch
a
rfe
Rev
e
rt "builtin-ar
c
hive:
u
se RUN_SET
U
P"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Gerrit
Pape
rename contr
i
b
/hooks/post-receie
v
e
-em
a
i
l to contr
i
b
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C
Hamano
RPM spec: include git-p4 in
t
he
l
ist
o
f
a
ll packages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
a
m
ano
rerer
e
: make
sorti
n
g rea
l
ly
stable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Brian G
e
rnhardt
Fix
t
4200-r
e
rere
f
o
r
wh
i
t
e
-space from "wc -l"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
E
r
ic Wo
n
g
git-svn: bail
out on incorrect comma
n
d
-
line options
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jakub Narebski
gitweb: Q
u
ote has
h
keys, a
n
d do not use bareword
s
keys
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jakub Narebs
k
i
git
w
eb: Wh
i
tespace
c
leanup -
tabs are for indent, spaces
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
amano
Fix
sw
i
t
c
hing
to a branch
with D/F when curren
t
bran
c
h
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Ham
a
no
Fix tw
o
wa
y
_me
r
ge that
p
a
s
s
ed d/f conflic
t
marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix read
-
t
ree --pr
e
fix=
d
i
r/
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
un
p
ack-t
r
e
es: get rid of *i
n
dpos p
a
rameter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
unpack_trees
.
c: pass unpack_trees_
o
ptions structure
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
add_cache_ent
r
y(): removal of file foo does not confl
i
c
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
M
erge b
r
anch 'jc/bise
c
t'
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hamano
Merge b
r
anch 'f
l
/
d
oc'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io
C
Hamano
Merge
b
r
anch '
p
o
st1
.
5
.
1/bla
m
e
.
e
l'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
Merge bra
n
ch 'post1
.
5
.
1/t
c
ltk'
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
Merge bra
n
ch
'post1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
amano
Merge branch 'lt/dirwalk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
g
i
t-read-tree --index-output=<file>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
_
GIT_INDEX_OUTPUT:
a
l
low plumbing to output to an alternativ
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
check
o
ut: allow detaching to HEA
D
even
w
h
en
s
w
i
tching
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
GIT 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
Merge 1
.
5
.
0
.
7 in
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
GIT
1
.
5
.
0
.
7
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jakub Na
r
ebski
Docu
m
entation:
A
few
m
i
nor fixes to Git
U
ser's M
a
nual
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Nicolas Pitre
Plug
m
emory leak in in
d
ex-pack collis
i
on ch
e
cking codepath
.
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Haman
o
rer
e
re should not repea
t
t
h
e ea
r
lier hunk
s
in later
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-02
Junio C Hamano
H
o
pefully
fi
n
a
l update to the draft
Rele
a
se Note
s
,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Jun
i
o C
H
amano
Optional Tck
/
Tk
:
ignore g
e
nerated fi
l
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
E
ygene R
y
abi
n
kin
Eliminate checks of user-specified Tcl/Tk int
e
r
preter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Eygene Ryabinkin
Rewri
t
e Tc
l
/Tk
i
nterpreter path for t
h
e GUI t
o
ols
.
commit
|
commitdiff
|
tree
2007-04-01
Eygene Ryabin
k
in
Add --wi
t
h-t
c
ltk and --
w
ithout-tcltk to co
n
figure
.
commit
|
commitdiff
|
tree
2007-04-01
E
y
gene Ryabin
k
in
N
O_TCLTK
commit
|
commitdiff
|
tree
2007-04-01
Eygene
R
yabinkin
Added correct Py
t
hon p
a
t
h
to
the RPM
specfile
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Brian Ger
n
hardt
Re
m
ov
e
unused WITH_OWN_SUBPROCESS_PY from RPM spec
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next