repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint'
2007-04-18
J
u
nio C Hamano
Me
r
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Ham
a
n
o
Start preparing fo
r
1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge
b
r
a
nch 'master
'
of git://r
e
p
o
.
o
r
.
cz/g
i
t-gui
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge
b
r
a
nch
'main
t
'
of git://repo
.
o
r
.
c
z/
g
i
t-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C
H
amano
Merge br
a
nch 'j
c
/rea
d
-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
git-gui:
H
onor TCL
T
K_PATH
if supplied
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
J
unio C Haman
o
Merge branch 'js/wrap-log
'
commit
|
commitdiff
|
tree
2007-04-16
J
unio C Hamano
send-email: do not leav
e
an empty CC
:
line i
f
no c
c
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
J
unio C Haman
o
M
erge b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-16
Ju
n
io C
H
amano
Merge branch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C
H
a
mano
Merge
git://gi
t
2
.
k
e
rnel
.
org/pub/scm/gitk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
M
e
r
ge branch '
m
ai
n
t
'
commit
|
commitdiff
|
tree
2007-04-14
J
uni
o
C Hamano
Do not def
a
ult to --no-index whe
n
g
iven
t
wo directories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Ham
a
n
o
Merge br
a
nch 'jc
/
che
r
ry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Ha
m
ano
M
erg
e
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-13
J
unio C Hamano
F
i
x
g
it {
l
og,sh
o
w,
.
.
.
}
-
-pretty=emai
l
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Do
c
ument
a
tion: --ch
e
rry-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
H
a
mano
g
it-log --
c
her
r
y-pick A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ha
m
ano
Refactor patch-id filt
e
ring out
of git
-
cherry an
d
g
it
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
unio
C
Haman
o
Add %m to '
-
-pre
t
ty=fo
r
mat:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C
H
amano
Mer
g
e branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ham
a
no
GIT 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Ha
m
ano
fsck: do
n
o
t
c
omplain on detac
h
ed HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-10
Junio
C Haman
o
t
3
030: m
e
rge-recurs
i
ve backend test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Hamano
merge-recur
s
ive:
handle D/F conflict case more carefully
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio
C Hamano
merge
-
recursive
:
do not ba
r
f o
n
"to b
e
r
e
moved" entries
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o
C Hamano
Treat
D
/F conflict
entry
m
o
re caref
u
lly in unp
a
c
k
-
t
ree
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Hama
n
o
t10
0
0
:
fix case table
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C
Hamano
shortlog -w: make wrap
-
line
b
ehavi
o
ur o
p
ti
o
nal
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
J
unio
C
Hamano
Merge branch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C Hamano
Merge branch
'
jc/
m
erge-subtree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
M
erge branch
'js/fetch-prog
r
ess'
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C Hamano
Merge br
a
nch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
Hamano
Add D
o
cumentation/cmd-list
.
made to
.
gitignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
C
Hama
n
o
Start 1
.
5
.
2 cycle b
y
prep
a
reing RelNotes for it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Mer
g
e branch 'jc/r
e
ad-tree-df' (early par
t
)
commit
|
commitdiff
|
tree
2007-04-08
Junio C
H
amano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hama
n
o
Prepar
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
n
ew merge
s
t
ra
g
et
y
'subtr
e
e'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io
C Ham
a
no
g
it-push to multiple locations
d
o
e
s
not sto
p
at
the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
gi
t
-
p
ush re
p
orts the
U
RL after failing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hamano
Merge branch
'jc/index-output'
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
Mer
g
e branch
'fp/
m
ake
-
j'
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C
Hama
n
o
Merge branch 'cc/bis
e
ct'
commit
|
commitdiff
|
tree
2007-04-07
J
unio C H
a
mano
M
e
rge
b
ra
n
ch 'jc/checkout' (early
part)
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o
C
Hamano
Mer
g
e bra
n
c
h
'
maint'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C H
a
mano
Document
a
t
i
on: tigh
t
en dependency
for gi
t
.
{
ht
m
l,txt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C
H
amano
git-bisect:
a
l
l
ow bise
c
ting with only o
n
e
b
ad commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
t603
0
: ad
d
a bit more
tes
t
s to git-
b
isect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Junio
C
H
ama
n
o
git-bisect:
modernization
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
Hamano
Merge branch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-05
Junio C
H
amano
Rename
add_file_to_
i
n
d
e
x
() to
add_file_to_cache()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ha
m
ano
Rename static variable
write_index to update_index
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io C Hamano
R
enam
e
internal function "add_file_t
o
_cache" in buil
t
in
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Pr
o
pagate ca
c
h
e
error inter
n
al
to re
f
resh_cache()
v
i
a
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io C Hamano
Fix bogus error m
e
ssage from m
e
rge
-
rec
u
rsive error
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o C Haman
o
Fix dependency of
common-
c
mds
.
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
RPM
s
pec: include git-p
4
in the
l
ist o
f
al
l
p
ackages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
rerere: make so
r
ting re
a
l
l
y stable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
amano
Fix sw
i
tching to a branch with D/F when current branch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix
t
wo
w
ay_merge that pa
s
s
ed d/f
con
f
lict marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hama
n
o
F
i
x read-tree -
-
p
r
efix=dir/
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
un
p
ack
-
trees: g
e
t rid o
f
*indpos parame
t
er
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Ham
a
n
o
unpack_trees
.
c: pa
s
s u
n
p
ack_trees_opt
i
ons structure
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
add
_
cache_entry()
:
remo
v
al of file foo does
n
ot conflict
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Haman
o
Merge b
r
anch 'jc
/
b
is
e
ct'
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C
H
a
mano
M
erge branch 'fl/doc'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Haman
o
Me
r
ge branch 'post1
.
5
.
1
/
bla
m
e
.
e
l'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Ha
m
ano
Merge b
r
anc
h
'post1
.
5
.
1/tc
l
tk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
Mer
g
e
b
ra
n
c
h
'
p
ost1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
n
o
Merge branch 'lt/dirwalk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
git-read-tree
--index-out
p
ut=<file>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
_GIT_
I
N
D
E
X
_OUTPUT: allow plumb
i
ng to
o
utput t
o
an al
t
ernativ
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C
Hamano
checkout:
a
llow detaching to HEAD even when switching
.
.
.
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
Juni
o
C Hamano
Me
r
ge 1
.
5
.
0
.
7 in
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
man
o
GIT 1
.
5
.
0
.
7
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C H
a
mano
rer
e
r
e
shou
l
d not repeat the earl
i
er
hunks
in la
t
er
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-02
Junio C Hamano
Hopefully final update to the
d
raf
t
Release Notes,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
J
u
nio C
Hamano
Optional Tck/T
k
:
ignore generated f
i
les
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Do not bot
h
e
r
docu
m
enting fetch--tool
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
J
unio
C Hamano
Update
d
raft rele
a
se no
t
es for 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
J
u
ni
o
C H
a
mano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Merge branch '
m
aste
r
' of
g
i
t://repo
.
or
.
cz/g
i
t/mergetool
.
gi
t
commit
|
commitdiff
|
tree
2007-03-28
J
uni
o
C H
a
m
a
no
Documentation: unbreak user
-
m
anual
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Ha
m
ano
GIT 1
.
5
.
1-rc
3
commit
|
commitdiff
|
tree
2007-03-28
Junio C Haman
o
Upd
a
te main git
.
html page 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 Hamano
Merge branch
'
m
a
int' to synchron
i
z
e with 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Ha
m
ano
GIT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Fix "--pr
e
tty=f
o
rmat:"
f
or
p
aren
t
r
e
lated items
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Juni
o
C Ha
m
ano
g
it
-
c
o
mmi
t
: "read-
t
re
e
-
m
H
EAD" is not the right
w
a
y
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Haman
o
sh
a
1_f
i
le
.
c (write
_
sha1_file): Detect close fai
l
ur
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
J
u
ni
o
C Hamano
D
ocument g
i
t-log -
-
first-pare
n
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hamano
GIT 1
.
5
.
1-rc2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
J
u
n
io C Hamano
Merge branch 'jc/fpl'
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hamano
Update README to point at a few key peri
o
dic
a
l mes
s
ages
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Ju
n
io C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hama
n
o
Merge branc
h
'maint' of git:/
/
linux-nf
s
.
org/~bfields
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
J
u
nio C Hamano
Merge branch 'js/remot
e
-show-push'
commit
|
commitdiff
|
tree
next