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
GIT 1.5.2.2
2007-04-11
Junio C
Hamano
fsck: do not co
m
plain
o
n de
t
ached HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-10
J
u
n
i
o C Hamano
git-
f
etch:
us
e
f
et
c
h--t
o
ol
p
ick-rref to avoi
d
local
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Ham
a
no
gi
t
-fetch--
t
ool
pick-rref
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio C Ham
a
no
t
3
030: me
r
ge-recur
s
ive backend test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Haman
o
me
r
ge
-
recu
r
sive: handle D/
F
conflict case mor
e
caref
u
lly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Ham
a
no
m
erge-re
c
ursive: do not b
a
rf o
n
"to be re
m
oved
"
en
t
r
i
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C H
a
mano
Treat
D/F conflict entry
m
ore carefully in unpack-trees
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Haman
o
t100
0
: fix
c
ase table
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C
Ha
m
ano
sh
o
r
tlog -w: make wrap-lin
e
b
e
haviou
r
opt
i
o
n
al
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io
C
Hamano
Merge
b
ranch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge b
r
anch 'jc/me
r
ge-subtree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge branch 'j
s
/fetch
-
progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ha
m
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C
H
a
mano
Add Documen
t
ation/cmd-list
.
made to
.
gitign
o
re
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio
C Hama
n
o
Sta
r
t 1
.
5
.
2
c
ycle by
prepa
r
eing RelNotes for it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Merge branc
h
'jc/rea
d
-tree-df' (
e
arly part)
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
C
Haman
o
Merge branch 'm
a
i
nt'
commit
|
commitdiff
|
tree
2007-04-08
Junio C
H
a
mano
Prepare
f
or 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Hamano
A ne
w
merg
e
stragety 'sub
t
r
e
e
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio
C
Hamano
git-push to m
u
l
t
iple
locat
i
ons does no
t
sto
p
a
t the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C
H
a
m
ano
git
-
push repor
t
s the URL after failing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hamano
M
erge branch 'jc/index-o
u
tput'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Hamano
Me
r
ge bran
c
h 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio
C
Hamano
Merge branc
h
'cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
Merge branch 'jc/check
o
ut'
(
early part)
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio
C
Hamano
Merge b
r
anch 'm
a
int
'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
Documentation: tighte
n
dependency for g
i
t
.
{
htm
l
,txt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io
C
Hamano
g
it-bi
s
e
ct:
a
llow b
i
secting with
only
o
ne b
a
d c
o
m
mi
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
t6030: add a
bit more
t
ests to git-bisect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
J
u
nio C Hamano
git-bisect: mod
e
rni
z
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C Ham
a
no
M
e
rge
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Renam
e
add_file_to_index() to add_fil
e
_to_cache()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C Hamano
Rename static variable write_index to
u
p
d
ate_index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ha
m
ano
Renam
e
internal fun
c
tion "add_file
_
t
o
_
c
ache"
in builtin
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Propagate cache error in
t
er
n
al to refresh_cache() via
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Ha
m
ano
Fix bogus e
r
r
o
r message from m
e
rge-recursive error
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Fix depend
e
ncy
o
f common-cmds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
RPM
spec: include g
i
t
-
p
4 in t
h
e list of al
l
packages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
rerere: m
a
ke sorting rea
l
ly
stable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
F
i
x switching to a branch with D/F when curren
t
branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Haman
o
Fix
tw
o
way_merge
that passed
d
/
f con
f
lict marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
ama
n
o
Fix read-t
r
ee --prefix=dir/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
unpack-
t
ree
s
: get rid of *indpos parameter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C H
a
man
o
unpack_t
r
e
e
s
.
c:
p
ass un
p
a
c
k_trees_options st
r
ucture
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hamano
add_c
a
che_en
t
r
y(): rem
o
val of file foo does not
co
n
flict
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
a
mano
M
erge branc
h
'j
c
/bisect
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Mer
g
e branch
'fl/d
o
c
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Haman
o
Merge branch 'post1
.
5
.
1
/blame
.
e
l'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
Merge b
r
anch 'post1
.
5
.
1
/
t
c
lt
k
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge branch
'post1
.
5
.
1
/p4'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
M
e
rge
b
ranch 'lt/dir
w
alk'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
i
o
C Ha
m
ano
git-read-
t
ree --index-out
p
ut=<file>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C
Hama
n
o
_GIT_INDEX_OUTP
U
T: allow plumbing to output to an alternativ
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
checkout: allow detaching to
H
E
A
D
e
v
en when sw
i
tching
.
.
.
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
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io
C Hamano
M
erge 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
Ju
n
io C Hamano
rerere should
n
ot repeat
t
he earlier hun
k
s
in lat
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Junio C Ham
a
n
o
Hopefully fina
l
update
to the draft Release Notes,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
J
unio C
H
a
m
a
n
o
Optional Tc
k
/Tk: ignore generate
d
files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Do not
b
othe
r
d
o
c
umenting f
e
t
c
h--tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
J
u
nio
C
H
amano
Upda
t
e
draft relea
s
e notes
f
or 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
J
u
nio C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-30
J
u
nio C Ham
a
no
Merge branch 'maste
r
' o
f
g
i
t://repo
.
o
r
.
cz/git/merg
e
t
ool
.
git
commit
|
commitdiff
|
tree
2007-03-28
Junio C Ha
m
ano
Documentation:
unbreak user-manual
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
unio
C Hamano
GIT 1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
J
unio C
H
amano
Update main
g
i
t
.
html pa
g
e to point at 1
.
5
.
0
.
6 documentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio
C Haman
o
Me
r
ge bran
c
h
'
maint' to s
y
n
c
h
ronize
with 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Haman
o
GIT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Fix "--pretty=format:" for
p
a
rent rela
t
e
d
item
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
git
-
commit: "read-tree -m HEAD
"
is n
o
t
t
he right
w
ay
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
J
unio C Ham
a
no
sh
a
1_file
.
c
(
write_sha1_file): Detect close failure
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio C H
a
mano
Document git-log --first-parent
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Ha
m
ano
GIT 1
.
5
.
1-rc2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio C
Hamano
Merge branc
h
'jc/fpl'
commit
|
commitdiff
|
tree
2007-03-26
J
u
nio C Ha
m
ano
Upda
t
e REA
D
ME t
o
point
at a few key period
i
c
al messa
g
es
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
J
u
nio C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-25
Ju
n
i
o
C
H
a
m
a
no
Merg
e
b
r
anch 'main
t
'
o
f
git:
/
/linux-nfs
.
org/~bfi
e
lds
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
J
u
n
io C Hama
n
o
Merge
branch 'js/remote-
s
h
o
w-push'
commit
|
commitdiff
|
tree
2007-03-25
Junio C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-24
Junio C H
a
mano
git-am docume
n
t
ation: describe
what is taken from wher
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Jun
i
o C H
a
m
a
n
o
make the previous optim
i
zation wor
k
also
o
n path-lim
i
ted
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio C
H
amano
rev-l
i
st --bisect: Fix "hal
f
way" optimiz
a
tion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio C Hama
n
o
Merge branch 'master' i
n
t
o
jc/bisect
commit
|
commitdiff
|
tree
2007-03-24
J
unio C
H
amano
Merge
b
ranch
'
m
a
int'
commit
|
commitdiff
|
tree
2007-03-24
Junio
C Hamano
Fix path-li
m
ited "
r
ev-list --bise
c
t" te
r
mi
n
ati
o
n con
d
ition
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Ju
n
io C Hamano
git-bi
s
e
ct
.
s
h:
pro
p
e
r
l
y dq $G
I
T_DIR
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
git-bise
c
t: typofix
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
c
heckout: report where the new HEAD is upo
n
detaching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
t6004: add a bit m
o
re pat
h
optimizat
i
on test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio
C Haman
o
git-apply: D
o
not fr
e
e the
w
r
ong bu
f
fer w
h
en we convert
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C
H
amano
M
e
rge git://git2
.
kernel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2007-03-22
J
unio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
git-
r
ebase: make 'reba
s
e HE
A
D b
r
anch' work
a
s e
x
p
ected
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C
H
amano
git
-
rev-lis
t
--bisect: optimizatio
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
J
u
nio C Ham
a
no
git-re
v
-
list: add -
-
bi
s
e
ct-vars option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Juni
o
C Hamano
t6002: minor spelling fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
J
u
nio C Ha
m
a
n
o
tree_entr
y
_interest
i
ng(): allow
it to say "
e
verything
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C
Hamano
tree-diff: avoid strnc
m
p()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next