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-
r
ec
u
rsiv
e
:
han
d
le D/F conflict ca
s
e mor
e
carefully
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
Hamano
mer
g
e
-
recursive: do not barf
o
n "to be removed" entries
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Hamano
Treat D/F
conflict entr
y
more carefully
in unpack-trees
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
t1000: fix case table
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
René
S
c
h
a
rfe
git-archive: make tar th
e
defau
l
t format
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C Ham
a
no
Me
r
ge
b
ranch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Mer
g
e branch '
j
c/m
e
rge-su
b
t
ree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio
C
H
a
mano
Merg
e
br
a
n
c
h 'js/fe
t
ch-progress
'
commit
|
commitdiff
|
tree
2007-04-09
J
unio C Hamano
Merg
e
branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-09
J
un
i
o C
H
amano
Add Document
a
tion/cmd-list
.
made
t
o
.
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
og command to avoid infinite loop on
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Er
i
c Wong
git-
s
vn:
d
commit/rebase confused by patches
w
ith git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Er
i
c
W
ong
git-svn:
b
ail
out on inco
r
re
c
t command-line options
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C H
a
mano
S
t
a
rt 1
.
5
.
2 cycle by prepar
e
ing RelNotes for
it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Merge branch 'jc/read-tre
e
-
df' (ear
l
y pa
r
t)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Ham
a
no
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C
H
amano
Pre
p
are f
o
r 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Frank Lichtenheld
cvsser
v
er: sma
l
l correcti
o
n
s
t
o
a
s
c
i
i
doc documentation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
A new
m
e
rge str
a
gety '
s
ubtree'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
no
git-pu
s
h to
m
ulti
p
le locations does no
t
s
t
op at t
h
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-p
u
sh reports
th
e
URL after failing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
Merge b
r
anch 'jc/index-output'
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Haman
o
Merge bran
c
h 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C
Ham
a
no
Merge branch 'cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge
branch 'jc/checkout' (ear
l
y
p
a
r
t
)
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch
'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Docum
e
ntat
i
on: tighten
depend
e
ncy for git
.
{ht
m
l,txt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arj
e
n Laarh
o
ven
Mak
e
file: iconv() on Darwin has the old interf
a
ce
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arjen
L
aarhoven
t5300-pack-
o
bject
.
sh:
portability is
s
u
e
u
si
n
g /usr
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
n
i
o C Hamano
git-bisect: all
o
w bisect
i
ng with o
n
ly one bad commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio
C Hamano
t6030:
a
d
d a bit more tests to git-bisec
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laarh
o
ven
t3200-br
a
nch
.
sh: small langu
a
ge nit
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laar
h
o
ven
user
m
an
u
al
.
txt: som
e
capitalization n
i
ts
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
La
r
s Hjemli
Make builti
n
-branch
.
c han
d
l
e
the
g
it c
o
nfig file
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Lar
s
Hjemli
rename_ref(): only pr
i
n
t a warni
n
g
w
hen c
o
nfig
-
fil
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Br
i
an Gernhardt
Disting
u
ish b
r
anches by more than
c
as
e
in tests
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
YOSHIFUJI Hide
a
ki
.
.
.
Avoid comp
o
sing too long
"
References" h
e
ader
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lichtenheld
cvsimport: Imp
r
ove format
i
ng co
n
s
istency
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
F
rank Lic
h
tenheld
cvsimport: Reo
r
d
e
r
o
ptions in do
c
umen
t
ation for better
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Fra
n
k Lichtenheld
cvsimport:
I
mprove usage
error reporting
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank
Lichte
n
held
cvs
i
mport: Impro
v
e d
o
cu
m
entation
of CVSROO
T
and CVS
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lichte
n
held
cvsimpo
r
t
: sync usage lines with existing
op
t
i
o
n
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Hamano
git-
b
isect: modern
i
za
t
ion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ha
m
ano
Merge bran
c
h
'
maint'
commit
|
commitdiff
|
tree
2007-04-05
D
a
na
H
ow
F
i
x
ls
e
e
k(2
)
cal
l
s with a
r
gs
2 and 3 sw
a
pped
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Fernand
o
J
.
Per
e
da
Makefile:
A
dd '+' to QUIET_SUB
D
IR0 t
o
fix parallel
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
C
h
ristian Couder
D
ocument
a
tion:
b
i
sect: "start" accepts on
e
bad and
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Chri
s
t
i
an Coude
r
Bise
c
t
: tea
c
h "bisect start
"
to optionally
use
o
ne
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Alex Riesen
Fi
x
p
a
ssing of TCLTK_PATH to
g
i
t-gui
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Hamano
Rename add_file_
t
o
_
i
ndex() to add_file_to_cache()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rename static var
i
able wri
t
e
_
index t
o
up
d
a
te_
i
ndex
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
Hamano
Rename in
t
e
rnal function "add_file_to_cac
h
e"
in buil
t
in
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C Hamano
Propagate c
a
c
h
e error
intern
a
l to refresh_cac
h
e()
via
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ha
m
an
o
Fix b
o
g
us
error
message from merg
e
-recursive err
o
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Andy
Pa
r
kin
s
Show
b
i
n
ary file size change in diff --stat
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Shawn O
.
P
ea
r
ce
Honor
-
p<
n
> when ap
p
lyin
g
git diff
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
Ha
m
ano
Fix dependen
c
y of common-cmds
.
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Shawn O
.
P
earce
Fix los
t
-found to show commits onl
y
refe
r
enced by
reflogs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Nicolas Pitre
clea
n
u
p
and optimize nth_p
a
cked_object_sha
1
(
) usage
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
G
eert
B
osch
Fix renaming b
r
anch withou
t
confi
g
f
i
le
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ville Sky
t
tä
DE
S
TDIR support for git/contrib/emacs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ja
k
u
b
Narebs
k
i
git
w
eb: Fi
x
bug in "blob
d
iff"
view for s
p
l
i
t
(
e
.
g
.
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
B
r
ian Gernhardt
Document --left-right
option to
rev-list
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Re
n
é
S
c
harf
e
Revert "bu
i
ltin-a
r
chive: use RU
N
_SETUP"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Gerrit
P
ape
rename co
n
trib/
h
ooks/post-receie
v
e-email to contrib
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Haman
o
RPM spec: include git-
p
4
in th
e
l
i
st of all packages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
rer
e
r
e
: make sor
t
ing
really
stable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Brian Gernhardt
F
ix t4200-rer
e
r
e
for w
h
ite-spa
c
e from "wc -l"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Eric Wong
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
gi
t
web: Quote ha
s
h
k
eys, and do
n
ot use ba
r
ewords
keys
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jakub Nar
e
b
s
ki
gi
t
we
b
: Whit
e
sp
a
ce cle
a
nup - tab
s
ar
e
for
i
ndent, spaces
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
amano
Fix swi
t
chin
g
to
a
bra
n
ch with D/F whe
n
curren
t
bra
n
ch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix
t
wowa
y
_me
r
ge
t
hat
passed
d/f conflict marke
r
to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix rea
d
-tree --prefix=dir/
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
u
n
p
a
ck-trees: get rid of *ind
p
os
parameter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Ham
a
n
o
unpack_
t
rees
.
c: pa
s
s unpack_trees_options
s
tructu
r
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
add_cache_entry():
remova
l
of file
foo does not
c
on
f
l
ict
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
Merge b
r
anch 'jc/bisect'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C H
a
m
ano
Merge branch 'fl/d
o
c'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
Merge branch 'post1
.
5
.
1/blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Ha
m
a
n
o
M
e
rge
b
ranch 'post1
.
5
.
1
/
tcltk
'
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
io
C
Hamano
Merge branch 'post1
.
5
.
1/p4
'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hamano
Merg
e
branch
'lt/dirwalk'
commit
|
commitdiff
|
tree
2007-04-04
J
un
i
o C Hamano
gi
t
-read-tree --index-
o
utp
u
t=<file>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
_
G
IT_INDEX_OUTP
U
T: all
o
w
plumbing to outp
u
t to an alte
r
nativ
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
checkout:
a
llow detac
h
ing to HEAD
e
ve
n
w
hen switc
h
ing
.
.
.
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
J
u
n
i
o C
Hamano
Merge
1
.
5
.
0
.
7 in
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
G
I
T 1
.
5
.
0
.
7
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jakub Narebsk
i
Documentation: A
f
ew minor
f
i
xes to Git User's Manual
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Nicol
a
s Pitre
Plug memory lea
k
in index-pac
k
collision ch
e
cking
codepath
.
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
rerere
s
hould not
rep
e
at the e
a
rlier
h
u
nks
i
n later
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-02
Jun
i
o C
H
amano
Hopef
u
lly
f
inal upda
t
e t
o
the draf
t
Release Not
e
s,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Junio C Hamano
Optio
n
al Tck/Tk: ignore generated files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Ey
g
e
ne Ryabi
n
kin
E
liminate checks of
use
r
-specifie
d
Tcl/T
k
interpre
t
er
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Eygene Rya
b
in
k
in
Rewrite Tcl/Tk
i
nterp
r
eter path for the
GUI
tools
.
commit
|
commitdiff
|
tree
2007-04-01
Eygene R
y
a
binkin
A
d
d --wi
t
h-tcltk and -
-
without-tclt
k
to co
n
figure
.
commit
|
commitdiff
|
tree
2007-04-01
Eyge
n
e Ryabinkin
NO_TCLTK
commit
|
commitdiff
|
tree
2007-04-01
Eygene Ryabinkin
Add
e
d
correct
Pyth
o
n path to the
R
PM specfile
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Brian Gernhardt
Rem
o
ve unused
WITH_OWN_SUBPR
O
CESS_PY from RPM sp
e
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next