repo.or.cz
/
git
/
mingw.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-22
Junio C Hamano
Merge branc
h
'
maint'
commit
|
commitdiff
|
tree
2007-04-21
Junio
C Hama
n
o
GIT 1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
J
u
nio
C
Ha
m
ano
g
i
t
-clone: f
i
x
d
umb protocol transport to clon
e
f
r
om
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C
Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-19
Ju
n
i
o
C Hamano
Merge branch '
m
a
in
t
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ha
m
ano
Merge b
r
anch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C
H
amano
Merge branch 'f
l
/cvsserver'
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C H
a
mano
Merge branch
'
m
ai
n
t
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Update draft re
l
eas
e
notes for 1
.
5
.
2 with accum
u
lated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
mano
M
e
rge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Hamano
S
t
art prep
a
ring f
o
r 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
a
m
ano
M
e
rge branc
h
'maste
r
' of git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Ham
a
n
o
Merge branch 'main
t
' of git://repo
.
or
.
cz/git-gu
i
into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hama
n
o
Merge branch 'jc/rea
d
-tre
e
-df'
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C Ha
m
ano
git-
g
ui: Honor
T
C
LTK_
P
AT
H
if supplied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio
C Ha
m
a
n
o
Merge branch
'
js/wrap-log'
commit
|
commitdiff
|
tree
2007-04-16
Junio
C
Hamano
send-email: do no
t
leave an
emp
t
y CC: line if
no cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Juni
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Ha
m
ano
M
e
rge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Merge git://git2
.
k
e
rnel
.
org/pub/scm/gitk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
M
e
rge
b
r
a
nch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C Hamano
Do not defaul
t
to --no-index whe
n
g
i
ven two directories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio
C Hamano
Mer
g
e branch 'j
c
/cherry'
commit
|
commitdiff
|
tree
2007-04-13
J
u
nio C
Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-13
J
un
i
o C H
a
mano
Fix git {log,show,
.
.
.
}
--pretty=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Doc
u
mentation:
--
c
herry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C Hamano
git-log -
-
ch
e
rr
y
-p
i
c
k
A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Haman
o
Refactor
patch-id filtering out of git-cherry and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
A
d
d %m to '--pretty=format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Hamano
Me
r
ge branch
'm
a
int'
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C Hamano
GIT 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Junio
C
H
am
a
no
f
sck: do not compla
i
n on de
t
ache
d
H
EAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Me
r
ge bra
n
ch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
t
3
0
3
0: merge-
r
e
c
ursi
v
e backend test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio
C Haman
o
merge-recurs
i
ve:
handle D/F c
o
nf
l
i
c
t case more
carefully
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
H
am
a
no
merge-recursive: do not barf
o
n "to be remov
e
d" entries
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C Hamano
Treat D/F
c
onflict
entry more
c
arefu
l
ly in unp
a
ck-t
r
ees
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Hamano
t1000: f
i
x c
a
se table
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
u
n
i
o C Ham
a
no
s
hortlog -w: make
w
rap-li
n
e behaviour o
p
t
i
onal
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C H
a
mano
Merge branch '
j
c
/push'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C Hamano
Merge b
r
anch 'j
c
/me
r
ge-subtree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C Ha
m
ano
Merge branch 'js/fetch-pro
g
re
s
s'
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
i
o
C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C Hamano
A
d
d Doc
u
me
n
tation
/
cmd-
l
ist
.
mad
e
to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio C Ha
m
ano
Start 1
.
5
.
2 cycle by pr
e
p
a
r
e
i
ng RelNotes for it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio C Hama
n
o
M
e
rge branch 'jc/
r
ead-
t
ree-df' (early
p
art)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hama
n
o
Merge
branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Pr
e
par
e
for
1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
A
new merge
s
tragety
'
sub
t
ree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-
p
ush to multiple locations doe
s
not stop at the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-push reports
the URL
aft
e
r failing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
Merge
branch 'jc/
i
n
d
ex-outp
u
t
'
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Ham
a
no
M
erge branch 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
Merge bran
c
h 'cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
man
o
M
erg
e
branch 'jc/chec
k
out' (early part
)
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Ham
a
no
Me
r
ge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hamano
Docu
m
en
t
ati
o
n:
t
ighten depende
n
cy for git
.
{html,txt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-bi
s
ect: allow bisecting with
only one bad commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hamano
t
6
0
30: add a
b
it more tests to git-bisect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Junio C
H
amano
git-bisect: moderniza
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-05
Junio C
Hamano
Rename add_
f
il
e
_
t
o_index(
)
to add_f
i
le_to_cache()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rename static variable wr
i
te_index to
upd
a
te_index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o
C
Hamano
Rename internal fu
n
ction "add_f
i
le_to_cache"
i
n
b
uiltin
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
ni
o
C
Hamano
P
r
opagate cache error intern
a
l to refre
s
h_cache() via
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io
C
Hamano
Fix bo
g
us error message from m
e
rge
-
recursive
err
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
H
amano
Fix de
p
e
ndency of common-cmds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
amano
RPM spec: inclu
d
e g
i
t-p4
i
n
the list of all packages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o
C Hamano
rerere: ma
k
e
sort
i
n
g
rea
l
l
y st
a
ble
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Haman
o
Fix swi
t
ching to a
bra
n
ch with D/F wh
e
n current branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
Fix twoway_merge
tha
t
p
ass
e
d d/f co
n
flict marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix read-tree --
p
refix=dir/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
unpack
-
t
r
ees:
g
et
r
id of *indpos param
e
ter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
u
n
pa
c
k_
t
rees
.
c
:
pass unp
a
c
k_t
r
ees_options
s
tructure
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
m
a
no
add_cache_entry
(
)
: remo
v
al of
fi
l
e foo does not conflict
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hama
n
o
Me
r
g
e
bran
c
h 'jc
/
bisect'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hamano
Merge branc
h
'fl/
d
oc'
commit
|
commitdiff
|
tree
2007-04-04
J
unio
C
Haman
o
Merge branch
'
post1
.
5
.
1
/
blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Ha
m
ano
Merge branch 'pos
t
1
.
5
.
1
/tcltk'
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C
H
a
mano
M
erge branch 'post1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C
Hamano
Merge branch 'l
t
/dirw
a
lk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
git
-
re
a
d-tree --index-output=<file>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
_G
I
T_I
N
DEX_OUTPUT:
a
llow pl
u
m
b
ing to output to an alternativ
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
checkout:
all
o
w d
e
tachi
n
g to HEA
D
even
w
hen 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
Junio C H
a
mano
Merge
1
.
5
.
0
.
7 in
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
aman
o
GIT 1
.
5
.
0
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
rerere shoul
d
not rep
e
at
t
he earlier hunks
in later
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Junio
C
H
a
m
ano
Hopeful
l
y
final update to
t
he dr
a
ft R
e
lease No
t
es,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Junio C H
a
mano
Optional Tck
/
T
k: ignore generated files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Juni
o
C Hamano
Do not
b
other d
o
c
u
m
enting fetch--tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Ju
n
io
C Ha
m
ano
Up
d
ate draft rel
e
ase 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 Ha
m
a
no
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-03-30
Junio
C
Hamano
Merge branch
'mas
t
er' of g
i
t://repo
.
or
.
cz/git/merge
t
ool
.
git
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Documen
t
ation
:
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
Junio C Hamano
Update main g
i
t
.
html page to po
i
nt at 1
.
5
.
0
.
6 docu
m
e
nta
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Ha
m
ano
Mer
g
e branc
h
'maint' to sy
n
c
hronize with
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C H
a
mano
GIT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o
C
Ham
a
no
Fix "--p
r
etty=format
:
" for parent r
e
lated
items
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next