repo.or.cz
/
git
/
jrn.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 H
a
mano
merge-recur
s
ive: handle D/F conflict
c
a
s
e more
c
arefully
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
m
erge-recursive: do no
t
barf on "to
b
e
remove
d
"
ent
r
i
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C Hamano
Treat D/F
conflict entry mor
e
carefully in unpack-tr
e
es
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
Hamano
t1
0
00
:
fix
case table
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
René S
c
harfe
git-a
r
ch
i
ve: make
tar the default
format
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C
Hamano
Merge b
r
anch 'jc
/
push'
commit
|
commitdiff
|
tree
2007-04-09
J
uni
o
C Hamano
Merg
e
branch
'
j
c/me
r
ge-subtree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
i
o
C
H
amano
Merge branch 'js/fetc
h
-progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge bran
c
h
'
maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
am
a
no
Add Documentatio
n
/
cmd-
l
ist
.
m
a
de to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Eric
W
o
ng
git-
s
v
n: fix
l
o
g command to
avoid infinite loop on
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Eric W
o
ng
g
i
t
-sv
n
:
d
commi
t
/rebas
e
confus
e
d by patc
h
es
w
it
h
git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Eric
W
ong
gi
t
-svn: bai
l
ou
t
on
incorrect command-line option
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
unio C Hamano
S
tart 1
.
5
.
2
cycle by pr
e
p
ar
e
i
ng Re
l
Notes fo
r
it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
C
H
amano
Merge bra
n
c
h 'jc/read-tree-df' (e
a
rly part)
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Haman
o
Prepare f
o
r 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Frank Lichtenhel
d
cvsserver: small
corre
c
tion
s
to asciidoc document
a
tion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C
Hamano
A new merge st
r
agety 'subtree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C
Hamano
git-pus
h
to multiple locations does not stop
at
t
h
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Haman
o
git-push
reports the URL
a
fter
f
ai
l
ing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hama
n
o
Merge bran
c
h 'j
c
/in
d
ex-output'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
Mer
g
e
branch
'
fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
Merge b
r
anch 'cc/
b
isect'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
M
er
g
e branch 'jc/checkout' (early part)
commit
|
commitdiff
|
tree
2007-04-07
J
un
i
o C Hamano
Merge branch
'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
H
a
mano
Documentation
:
tight
e
n depende
n
cy for git
.
{html,txt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laarhoven
Makefile: iconv() on D
a
rwin has
t
he old inter
f
ace
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Arje
n
Laarhoven
t5300-pack-o
b
j
e
ct
.
sh
:
portability
issue using /usr
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
no
git-bisec
t
:
a
l
lo
w
bisec
t
i
n
g
w
i
th only on
e
bad commi
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Ha
m
an
o
t
6
030: add a bit more tests
t
o git-bisect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
A
r
jen
L
aarhoven
t3200-br
a
nch
.
sh: sm
a
ll
l
anguage
nit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ar
j
en Laarhoven
u
se
r
m
a
nual
.
txt: some
c
apitalization nits
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Lars Hjemli
Mak
e
buil
t
in-branch
.
c handle
t
he git conf
i
g file
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Lars
H
jemli
rename_ref(): on
l
y print a warning when config-file
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Bri
a
n Gern
h
ardt
Distinguis
h
branches by more t
h
an case in tests
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
YOS
H
IFUJ
I
H
i
deaki
.
.
.
A
v
oid compos
i
ng too
l
ong
"
References" header
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lic
h
tenh
e
ld
cvsimpor
t
: Improve formating
c
on
s
istency
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
F
rank Lichtenheld
cvsi
m
port: Reorder options in
d
o
c
umentation for better
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Fr
a
nk Lich
t
e
n
held
cvs
i
mport: Improv
e
usage error r
e
porting
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
F
r
an
k
Lichtenheld
cv
s
import: Improve
d
o
c
umentation of CVSROOT
a
nd CVS
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lichtenheld
cvsimp
o
rt: sync u
s
age lines with
e
x
i
s
tin
g
options
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Jun
i
o C Hamano
git-b
i
sect
:
m
odernizat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C H
a
ma
n
o
Merge branc
h
'm
a
int'
commit
|
commitdiff
|
tree
2007-04-05
Dana How
Fi
x
lseek(2) calls with a
r
gs 2 and 3 swapped
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Fernando J
.
Pered
a
Makefile: Add '+'
t
o QUIET_SUBDIR0
t
o fix parallel
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Christi
a
n Co
u
der
D
o
c
u
mentation:
bi
s
ect: "start
"
accepts
one bad and
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Chr
i
sti
a
n
Couder
B
i
sect: teach
"
bisect start" to optionally u
s
e one
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Alex Ri
e
sen
Fix passing of TCLTK_PATH t
o
git
-
gui
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
R
e
na
m
e a
d
d_file
_
to_index
(
) to add_fil
e
_to_cache()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
Ham
a
no
Rename static va
r
iable write_
i
ndex to
u
pdate_ind
e
x
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C H
a
mano
R
ena
m
e
internal fu
n
cti
o
n
"add
_
file
_
to_cache" in builti
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
Hamano
Propagat
e
c
a
che
error int
e
rnal to refre
s
h_
c
ache(
)
via
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
unio C Hamano
Fix bogus err
o
r messa
g
e
from merge-re
c
ursive error
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Andy Parkins
Show binary file size change in
d
i
ff --stat
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Shawn O
.
P
e
arce
Honor -p
<
n> when applyin
g
git diffs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Fix dependency of
commo
n
-cmds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Shawn O
.
P
e
arc
e
Fix
lost-found to show commits on
l
y re
f
erenced by
reflogs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Nicolas
Pitre
clean up and optimi
z
e nth_pa
c
ked_
o
b
je
c
t_sh
a
1() usage
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Geert Bosch
Fix renaming branch
w
ith
o
ut c
o
nfig
f
ile
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
V
i
l
le Skyt
t
ä
DESTDIR support for git/contrib/
e
macs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Jakub Narebski
g
itweb: Fix bug in "blobdiff"
view for
s
p
l
i
t (e
.
g
.
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Brian Gernhardt
Docume
n
t --left-r
i
ght option to
r
ev-list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
René Scharfe
Reve
r
t
"bui
l
t
in-archive:
u
se RUN_SETUP"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Gerrit Pape
renam
e
contrib
/
h
oo
k
s/post
-
re
c
eieve-ema
i
l to co
n
trib
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C
H
am
a
no
RPM spec: include git-p4 in the list of al
l
pac
k
ages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
i
o C
H
amano
rerere: make
so
r
t
ing really sta
b
le
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
B
r
i
a
n Gernhardt
Fix t4200-rer
e
re for white
-
space
f
ro
m
"
wc -l"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Eric Wong
git-svn
:
ba
i
l out on incorrect command-
l
i
ne
opti
o
n
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
akub Nareb
s
ki
gitweb:
Q
uote
ha
s
h keys, and do not use barewords
keys
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ja
k
ub Nare
b
ski
g
itweb: White
s
pace
c
l
ean
u
p -
t
abs are
f
or ind
e
nt, s
p
aces
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
a
mano
Fix swi
t
c
h
ing t
o
a branch with
D
/
F
when current
branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio
C
H
amano
Fix twoway_mer
g
e that passed d/f c
o
nflict marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hamano
Fix
read-tree --p
r
efix
=
dir/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
unpack-
t
rees: get rid
o
f *
i
ndpos parameter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
i
o C Hamano
unpack_trees
.
c
: pass
unp
a
ck_trees_o
p
tions
s
tructure
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
add_cache_en
t
ry():
removal
of
file foo do
e
s not
conflic
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
Merge branc
h
'jc/b
i
s
ect'
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C H
a
m
ano
M
e
rge
branch 'fl/doc'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C
H
ama
n
o
Mer
g
e bran
c
h 'post
1
.
5
.
1
/blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hamano
M
e
rge
b
ranch 'pos
t
1
.
5
.
1
/
tcltk'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
Merge branch 'post1
.
5
.
1
/p4'
commit
|
commitdiff
|
tree
2007-04-04
J
unio
C
H
a
mano
Merge branch 'lt/dirw
a
lk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
git-r
e
ad-tree --in
d
ex-output=<
f
ile
>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
_G
I
T
_
INDEX_OUTPUT: allow pl
u
mbing to
o
u
tput to an alternativ
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Ham
a
no
checkout: allow de
t
a
c
h
i
n
g
to HEAD ev
e
n when sw
i
tching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Haman
o
GIT 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hamano
Merge 1
.
5
.
0
.
7
in
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hamano
GIT
1
.
5
.
0
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jakub Narebski
Docum
e
ntation: A few minor fixe
s
to Git User's Manual
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ni
c
olas Pitre
Plug memory
l
eak in
i
ndex-p
a
ck collision checking
codep
a
th
.
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
rerere
s
h
o
uld not repeat th
e
e
a
r
lier hunks
i
n late
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Junio C Hama
n
o
Hopefully f
i
nal update
t
o
the d
r
af
t
Release Notes,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Junio C Hamano
Opt
i
o
na
l
Tck/Tk: ignore
ge
n
er
a
ted
f
i
les
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
E
ygene
R
yabi
n
kin
Eliminate checks
o
f user-sp
e
cified Tcl/Tk
interpreter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Eygene
Ryabinkin
Rewrite Tcl/Tk in
t
erp
r
e
t
e
r path for the
G
UI tools
.
commit
|
commitdiff
|
tree
2007-04-01
Eyg
e
ne
Ryabinkin
A
d
d
-
-with-tcltk and -
-
wi
t
hout-
t
cltk t
o
confi
g
ure
.
commit
|
commitdiff
|
tree
2007-04-01
Eygene Ryabinkin
NO_TCLTK
commit
|
commitdiff
|
tree
2007-04-01
Eyge
n
e Ryabin
k
in
A
d
ded correct Python
p
at
h
to the RPM specfile
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
B
r
ian Gernhardt
Remove
u
nused
W
ITH_OWN_SUBPROCE
S
S_P
Y
f
r
om RPM spe
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next