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
t/test-lib.sh: Protect ourselves from common misconfiguration
2007-04-07
Junio C
H
a
mano
A
new merge stragety 'subtree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
git-
p
ush to
m
ulti
p
le locat
i
ons does not sto
p
at th
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-push repo
r
ts the URL after failing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io
C H
a
mano
M
erge branch
'
jc/in
d
ex-output'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Me
r
g
e
branch 'fp/make-
j
'
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hamano
Merge branch 'cc
/
bisec
t
'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
M
erge b
r
anch 'jc/checkout'
(
early par
t
)
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C
H
amano
Merge
b
ranc
h
'
m
aint'
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio
C
Hamano
Doc
u
ment
a
t
i
on: t
i
gh
t
e
n
dependenc
y
for git
.
{html,tx
t
}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
no
git-bi
s
e
ct: allow bisecting with
o
nly
o
ne
bad commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Ha
m
ano
t6030: add a bi
t
m
o
r
e
tests to git-bi
s
ect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Hamano
git-bi
s
ect: modernization
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C H
a
mano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-05
Junio C
Hamano
Rename ad
d
_file_to_index() to ad
d
_f
i
l
e
_
to_cache()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ha
m
ano
R
ena
m
e static vari
a
ble write_
i
ndex to
u
p
d
ate_i
n
dex
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
Hamano
Rename internal fu
n
ction "add_file
_
to_
c
ache" in builtin
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Hamano
P
ropaga
t
e
c
ache err
o
r internal to ref
r
esh_ca
c
he() via
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
F
ix bogus err
o
r messag
e
from merge-recursive er
r
or
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C H
a
mano
Fix depend
e
nc
y
of common-
c
md
s
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C
H
a
m
ano
RPM spec: i
n
clu
d
e
g
it-p4 in
t
he li
s
t of all packages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hamano
r
e
r
ere: make sorting re
a
l
ly stable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
Fix switch
i
ng to a branch with D/F when cur
r
e
n
t branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Ha
m
ano
F
ix t
w
oway_merge
th
a
t passed d/f
c
onfli
c
t
m
arker 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
Junio C Hamano
unpack-trees: get rid of *indpos 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_options structure
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
a
mano
add
_
cache_entry(): r
e
m
o
val o
f
file foo does not conflic
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o
C Haman
o
Merg
e
branch 'j
c
/
b
isect'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge branch 'fl/doc'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Me
r
g
e
branch 'post1
.
5
.
1/b
l
ame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
J
un
i
o C H
a
man
o
Me
r
ge branch 'post1
.
5
.
1/tcltk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
M
erge b
r
anch 'p
o
st1
.
5
.
1
/
p
4'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge bran
c
h 'lt/d
i
rwalk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
git-read-t
r
ee
--in
d
e
x
-out
p
ut=<file>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio
C
H
ama
n
o
_GIT_IND
E
X_OUTPUT: a
l
low
pl
u
m
bing to ou
t
put t
o
an
a
lte
r
nat
i
v
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio
C
Hama
n
o
checkout: allow detaching to HEAD even
whe
n
swit
c
hing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C
H
a
m
ano
G
I
T 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
M
er
g
e 1
.
5
.
0
.
7
i
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
GIT 1
.
5
.
0
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hamano
rere
r
e should not repeat
t
h
e
earl
i
er hu
n
ks i
n
la
t
er
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Jun
i
o C Ha
m
a
n
o
Hopefully final
u
pd
a
t
e
to the draft Release Notes,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
J
un
i
o C
H
a
m
ano
Optional
T
ck/Tk
:
i
g
nore generated files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio
C
Hamano
Do
n
ot b
o
ther documenting fetch--tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
J
unio C Hamano
Update dr
a
ft
r
e
l
e
ase notes for 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
J
u
nio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
M
erge branch
'mast
e
r' of git://repo
.
or
.
cz/g
i
t/mergeto
o
l
.
git
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o C Hamano
Documen
t
at
i
o
n
: unbrea
k
u
ser-manual
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C
H
am
a
no
GIT 1
.
5
.
1-
r
c
3
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Update main git
.
h
tml page t
o
p
o
int at
1
.
5
.
0
.
6 do
c
umen
t
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C H
a
mano
Merge b
r
anch 'maint' to synchronize w
i
th 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C
H
amano
GIT
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
F
i
x "--pretty=f
o
r
m
a
t
:" fo
r
parent r
e
lated items
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
u
nio
C
H
a
m
a
no
git
-
commit: "read-tre
e
-
m HE
A
D" is
not
t
he right wa
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
J
unio C
H
amano
sha1_fi
l
e
.
c (write_
s
h
a
1
_file): Detect close fai
l
ure
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Juni
o
C Hamano
Document gi
t
-log
-
-firs
t
-parent
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hamano
GIT 1
.
5
.
1
-
r
c
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio C
H
a
mano
Merge br
a
nch 'jc/fpl'
commit
|
commitdiff
|
tree
2007-03-26
Juni
o
C Hamano
Update RE
A
D
M
E t
o
point at a few key pe
r
iodica
l
mess
a
ges
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
J
u
n
i
o
C
Hamano
Merge
b
r
anch 'mai
n
t
'
commit
|
commitdiff
|
tree
2007-03-25
Junio
C Ha
m
ano
Merge branch 'maint' of git://linux-nfs
.
org/~bfiel
d
s
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
Juni
o
C
Hamano
M
e
rg
e
branch 'js/remote-sho
w
-push'
commit
|
commitdiff
|
tree
2007-03-25
Junio C
H
amano
Merge
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-03-24
Junio
C
Hamano
g
i
t-
a
m d
o
cumentation
:
des
c
ribe what is taken from
where
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio C Ham
a
no
m
ake
t
h
e p
r
evious optimization
work
also on
p
ath-limited
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Jun
i
o C Hamano
re
v
-l
i
st
--bise
c
t: Fix "halfway" optimizatio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio C Hamano
M
e
r
g
e branch 'master'
int
o
jc/
b
i
s
ect
commit
|
commitdiff
|
tree
2007-03-24
Junio C Ha
m
ano
Merge br
a
nch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-03-24
Junio
C Hama
n
o
Fix path-lim
i
ted
"rev-li
s
t --bisec
t
"
t
er
m
ination condition
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Haman
o
git-b
i
sect
.
sh: properly dq $GIT_DIR
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C H
a
mano
git-bisect
:
typ
o
fix
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
chec
k
out
:
rep
o
rt where the new H
E
A
D
i
s
up
o
n
detac
h
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C
H
amano
t6004: add a bit
m
o
re
pat
h
optimiz
a
t
i
on test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
J
u
nio C
H
a
man
o
git-appl
y
: Do not
f
ree the wro
n
g buffer when
we co
n
v
ert
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
J
u
nio
C
H
amano
Merg
e
git:/
/
g
i
t2
.
kernel
.
org/pub/scm
/
gitk/gitk
commit
|
commitdiff
|
tree
2007-03-22
Junio C
Hamano
Me
r
ge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-03-22
Junio C H
a
mano
git-rebase: make 'rebase HE
A
D branch
'
w
ork as expected
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Ju
n
io C
Ha
m
ano
git-rev-list --
b
i
s
ect:
o
pti
m
izat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
git
-
rev-list: ad
d
-
-
bis
e
ct-vars
o
ption
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
J
u
nio C Hamano
t6002:
minor spelling fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Juni
o
C Hama
n
o
t
ree_ent
r
y_
i
nteresting(
)
:
allow it t
o
say
"
ev
e
ry
t
h
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
tree-
d
iff: avoid strncmp()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Juni
o
C
Hamano
T
e
a
c
h tree
_
e
ntry_inte
r
e
st
i
ng() th
a
t
the tree entries
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Jun
i
o C Hamano
blame: cmp_suspe
c
t is not "cmp" anymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-20
J
un
i
o C Hamano
Merge git
:
//git2
.
k
e
rne
l
.
org/pub/scm/gitk
/
gitk
commit
|
commitdiff
|
tree
2007-03-20
Junio C Ham
a
no
blame: micro-opt
i
mize cmp
_
s
u
spect()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
Junio C Hamano
GIT 1
.
5
.
1
-rc1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
Junio C Hamano
Fi
x
merge-index
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
Junio
C
H
a
m
ano
Merge branch 'jb/gc'
commit
|
commitdiff
|
tree
2007-03-19
J
u
nio C Ha
m
ano
Merge branch 'fl/cvsserver
'
commit
|
commitdiff
|
tree
2007-03-19
Jun
i
o
C
Hama
n
o
Merg
e
br
a
n
c
h 'sp/run-
c
ommand'
commit
|
commitdiff
|
tree
2007-03-18
Jun
i
o C Ham
a
no
Update main git
.
html pag
e
t
o poin
t
at 1
.
5
.
0
.
5
docume
n
tation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-18
Junio C Ha
m
ano
Merge bra
n
ch 'a
r
/di
f
f'
commit
|
commitdiff
|
tree
2007-03-18
J
u
n
i
o
C Hama
n
o
M
e
rge 1
.
5
.
0
.
5 in
fro
m
'maint'
commit
|
commitdiff
|
tree
2007-03-18
Junio C
H
amano
GI
T
1
.
5
.
0
.
5
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-17
Junio C H
a
mano
Merge
b
ranch 'mai
n
t
'
commit
|
commitdiff
|
tree
2007-03-17
Junio C Hamano
appl
y
mbox: brown paper bag fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Ha
m
ano
git-log
--
f
ir
s
t-parent: show only the fi
r
s
t parent log
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C
H
amano
try-to-
s
i
mpl
i
fy-commit
:
use diff-t
r
ee --q
u
i
et machinery
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
r
evi
s
i
on
.
c: e
x
plain what tr
e
e_dif
f
erence does
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Juni
o
C Hamano
T
e
a
c
h
--quiet to diff backends
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next