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 branch 'np/pack'
2007-04-22
Junio C Hamano
M
e
rge branch 'np
/
pac
k
'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C H
a
ma
n
o
Merge branch 'jp/
r
efs'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge
branch 'jc
/
quic
k
fetch'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge
b
ranch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-21
Junio C
Hama
n
o
G
I
T
1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
H
amano
git-clone: fix dumb protocol transpor
t
to
c
lone
f
rom
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
J
unio C Hamano
M
erge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-19
Ju
n
io
C Hama
n
o
M
erge
b
r
an
c
h
'main
t
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
n
o
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
Merge branch '
f
l/cvsserver
'
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
M
e
rge b
r
an
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Haman
o
Update dr
a
ft
r
elease notes for 1
.
5
.
2 wi
t
h accumula
t
ed
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
m
ano
Merge b
r
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o
C Hamano
Start prep
a
ring for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ha
m
a
n
o
Merge branch 'master' of
g
it://rep
o
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Ha
m
ano
Merge branch 'ma
i
nt' of git://r
e
po
.
or
.
cz/git-gui int
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
amano
Merge branch 'jc/read-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
gi
t
-gui: Hono
r
TCLTK_PATH if
supplied
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hama
n
o
Make sure quickfetch is not f
o
ol
e
d with a previous
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Juni
o
C
Hama
n
o
Merg
e
branch 'js/wrap-log'
commit
|
commitdiff
|
tree
2007-04-16
Jun
i
o C Hamano
send-email: do
not leave an empty CC: lin
e
if no
cc
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Ha
m
ano
Me
r
ge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio
C
Hamano
Merg
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Merge git://git2
.
k
ernel
.
org
/
p
ub/scm/gitk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io
C Hamano
Merge
b
ranch 'maint
'
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C H
a
ma
n
o
Do not default to --no-inde
x
when giv
e
n
t
wo
directories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Ju
n
io
C Hamano
Me
r
ge b
r
anc
h
'
j
c/cherry'
commit
|
commitdiff
|
tree
2007-04-13
J
unio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
J
u
nio C Hamano
Fix git {log,show,
.
.
.
} --pret
t
y=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C
H
amano
Documentation:
-
-cherry-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
g
it-lo
g
--c
h
erry-pick A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Refactor patch-id filtering out of git-cherry and
g
it
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C
H
amano
Add %m to '
-
-pretty=format:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
H
amano
M
e
rge
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-12
Junio C
H
a
man
o
GIT
1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
J
u
nio C Hama
n
o
fsck: do
n
ot
c
omplain on d
e
tach
e
d HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ha
m
ano
g
it-f
e
tch: use fetch--tool pick-rr
e
f to avoid local
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Hamano
git-fetch--tool p
i
ck-rref
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ha
m
ano
t3030:
m
er
g
e
-
recu
r
si
v
e backend test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C Hamano
merge-recursive: h
a
ndle
D/F confli
c
t case more careful
l
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C Ha
m
ano
me
r
ge-r
e
cursive: do not bar
f
on "to be removed" entries
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Haman
o
Treat D/F con
f
l
i
ct entry
more carefully in unpack-t
r
ees
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C
H
am
a
no
t1
0
00: fix case table
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
sh
o
r
t
l
o
g
-w
:
make wra
p
-lin
e
behaviour op
t
iona
l
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C Hamano
M
erge
b
ranch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C
H
amano
Merge
bra
n
ch 'jc/merge-s
u
btree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o
C
Haman
o
M
erge bra
n
ch
'js
/
fetch-progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
ama
n
o
Merge branc
h
'
m
ain
t
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
aman
o
Add Do
c
umentation/cmd
-
list
.
made to
.
gitign
o
r
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C H
a
mano
Start 1
.
5
.
2 cycle by prepareing RelNot
e
s for it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Merge bran
c
h 'jc/re
a
d-tree-df' (early part)
commit
|
commitdiff
|
tree
2007-04-08
J
unio C Hamano
Merge branch 'm
a
i
n
t'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Prep
a
r
e for
1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
unio
C
Hamano
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
gi
t
-
push
to multiple locations does
n
ot sto
p
at
t
he
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o
C
H
amano
git-push reports the URL after fa
i
ling
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io
C Ha
m
ano
Merge branch 'jc/index-outp
u
t'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
a
mano
Merge branch 'f
p
/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
M
e
r
g
e
b
r
anch 'cc/
b
isect'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch 'jc/checko
u
t'
(early p
a
rt)
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
Merg
e
branc
h
'mai
n
t
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Ham
a
no
Documentatio
n
: t
i
ghte
n
dependency for git
.
{ht
m
l,tx
t
}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C
Hama
n
o
git-bisect: al
l
ow bise
c
ting with only one
b
ad
c
ommit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
a
m
a
n
o
t6030: add a bit more tests t
o
git
-
bis
e
c
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Junio C
Ha
m
a
n
o
gi
t
-bis
e
c
t: moder
n
iz
a
tion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-05
Junio C H
a
mano
Rename add_file_to_index
(
) to add_f
i
le_
t
o_
c
ac
h
e()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o C Haman
o
Rename
s
tatic varia
b
le write_index
to upda
t
e_index
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
R
e
name i
n
ternal f
u
nction "add_file_
t
o_cache"
i
n builtin
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Juni
o
C Hamano
Pro
p
agate cache error internal to refresh_cache() via
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io C
Hamano
Fi
x
bog
u
s error m
e
ss
a
ge from me
r
ge-
r
ecursive er
r
or
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Hamano
Fix de
p
endency
of comm
o
n-cmds
.
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hamano
RPM spec: i
n
c
lude git-p4 in the list
of all p
a
ckages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
rere
r
e: ma
k
e sortin
g
really sta
b
le
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
Fix sw
i
t
ching to a branch
w
i
t
h
D
/
F when current branch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
Fix twoway_merge that passed d/f conflict marker
to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hama
n
o
Fi
x
read-tree
-
-pr
e
fix=dir/
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C
Hamano
unpack-trees: g
e
t
rid of
*indpo
s
para
m
eter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
u
npack
_
trees
.
c: pass unp
a
ck
_
t
ree
s
_opti
o
ns
s
tructure
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
add_cac
h
e_entry():
r
emoval of file foo does not conflict
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C
Hamano
Merge br
a
nch 'jc/bise
c
t'
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
Merge branch 'fl/do
c
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge branch 'post1
.
5
.
1/blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
J
u
ni
o
C Hamano
Merge bran
c
h '
p
ost1
.
5
.
1/tclt
k
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
M
e
rge bra
n
ch '
p
o
st1
.
5
.
1/p
4
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge b
r
anc
h
'lt/d
i
rwal
k
'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C H
a
m
a
no
git-read-
t
ree
-
-
i
ndex-output=<f
i
le>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hama
n
o
_GIT_INDEX_
O
UTPUT:
a
l
lo
w
plumbin
g
to out
p
ut t
o
an alternativ
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
am
a
n
o
checkout: allo
w
detaching
t
o H
E
AD even when swit
c
hing
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C H
a
man
o
GIT 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
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
Junio C H
a
mano
rerere sh
o
uld
not
repeat the
e
arlier h
u
nks in later
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-02
Junio C Hamano
Hop
e
fully final update to the draft Release Notes,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Ju
n
io
C
Hamano
Optional
Tck/Tk
:
igno
r
e generated files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
D
o not bother documenti
n
g fetc
h
--too
l
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C H
a
m
ano
U
pd
a
te draft rel
e
a
se
notes f
o
r 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Ju
n
i
o
C Ha
m
ano
Mer
g
e bra
n
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Merge
br
a
nch 'master'
o
f git://r
e
po
.
or
.
cz/git/mergetool
.
g
i
t
commit
|
commitdiff
|
tree
next