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 'jc/blame-boundary'
2006-12-18
Jun
i
o
C
Hamano
Merge bran
c
h 'jc/blame-bounda
r
y'
commit
|
commitdiff
|
tree
2006-12-18
J
u
nio C
Hama
n
o
Mer
g
e branch 'jc
/
reflog'
(
earl
y
pa
r
t)
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
M
e
r
g
e branch 'js/branch-config'
commit
|
commitdiff
|
tree
2006-12-18
Junio C Ham
a
no
M
e
rge branch '
j
n/web' (e
a
rly
p
art)
commit
|
commitdiff
|
tree
2006-12-18
J
u
nio C Ha
m
ano
avoi
d
accessin
g
_all_ loos
e
refs
in gi
t
-show
-
ref -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
g
i
t-
f
etch: Avoid rea
d
ing packed refs o
v
e
r and over
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
Teach
show-bra
n
c
h
h
o
w to show ref-log data
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C
Ha
m
ano
ma
r
kup fix in svnim
p
ort documentati
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C
H
a
m
ano
Fix mis-mark-up in
g
i
t
-
merge-file
.
txt
documentat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C
Ha
m
ano
Fix check
_
file
_
dir
e
c
tory_conflict()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio
C
Hamano
git
-
add: remove c
o
n
fli
c
t
i
ng en
t
ry when add
i
ng
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Ju
n
io C Ha
m
ano
update-
i
nde
x
:
make D/
F
conflict
err
o
r
a bit more ve
r
bose
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
J
u
nio C Hamano
merge: give
a
bit prettier merge message to "merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Ham
a
no
M
e
rge
b
ranch 'js/show'
commit
|
commitdiff
|
tree
2006-12-14
Ju
n
io C Hamano
git-r
e
s
et
[
--mixed] <
t
ree>
[--]
<p
a
ths>
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
J
unio C Ham
a
no
git-reset:
make it
w
ork from wit
h
in
a sub
d
irect
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
git-f
e
tch: make it
work from within a su
b
d
irect
o
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hama
n
o
Merge branch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2006-12-14
Juni
o
C Hamano
Update git-diff do
c
u
m
en
t
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
J
u
nio C Hamano
Merge b
r
anch 'jc/d
i
ff--cached'
commit
|
commitdiff
|
tree
2006-12-13
J
u
ni
o
C Hamano
git-svn: a
l
low both diff
.
co
l
o
r
a
nd color
.
d
i
ff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Ha
m
an
o
config documen
t
at
i
on: group c
o
lor
i
t
e
ms toget
h
er
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Hamano
git
-
blame: show
l
ines attributed to boundary
commits
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C H
a
mano
Mer
g
e branch 'j
c
/read-tree-ignore'
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o
C Hamano
Merge bran
c
h 'ew/rerere'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Mer
g
e branch '
n
p/a
d
dcommit'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
amano
Mer
g
e branch '
l
h/branc
h
-rename'
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Hama
n
o
Merge
b
r
anch 'j
c
/commit-careful'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
H
amano
Mer
g
e branc
h
'
a
p/clone-origin'
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o
C Hamano
Merge branch
'
j
c/numstat'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
H
am
a
no
Merge branch 'rr/cvs
e
x
p
or
t
commit'
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Haman
o
Merge branch 'ap/branch'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Haman
o
b
r
a
nch --color
:
change
d
efaul
t
color selectio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ham
a
no
M
erge bran
c
h 'js/merge'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ham
a
n
o
send-pa
c
k: t
i
g
hten check
s
f
o
r remot
e
names
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C Hamano
git-push: acce
p
t tag <tag> as
adverti
s
ed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
spurious
.
sp in m
a
npage
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Haman
o
git
merge: reword f
a
i
l
u
r
e me
s
sage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C H
a
m
a
no
R
e
ver
t
"git-diff: Intro
d
uce --i
n
dex and
dep
r
ecate
.
.
.
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C Hamano
M
e
rg
e
branch 'maint'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Hamano
git-push
:
docu
m
e
n
t removal of remote re
f
with :<ds
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o
C H
a
mano
M
e
rge branch 'mas
t
e
r'
i
nto js/merge
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2006-12-13
J
unio C H
a
mano
add t
e
st case fo
r
recursive merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hamano
d
i
ff
--numstat
:
show binar
y
w
i
th '-' to
match "
a
ppl
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hamano
shortlog: fix se
g
fau
l
t on empty authorna
m
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Ju
n
io
C
Hamano
s
hort
l
og: remov
e
"
[
PATCH]" prefix
fro
m
shortlog outpu
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio
C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2006-12-10
Jun
i
o C Hamano
git-
c
ommit: all
o
w --only to lose what was s
t
aged earlier
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-10
Junio C Hamano
Doc
u
men
t
ation/git-comm
i
t
:
r
e
write to make it
m
ore
end
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
Ju
n
io C Hamano
git-rerere: add 'gc' c
o
mmand
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Jun
i
o
C
H
a
mano
Fix perl/ build
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
Junio C Hamano
M
erge branch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2006-12-06
Jun
i
o C Hamano
git-merge: f
i
x
"
fix
confusion
between
tag and b
r
anch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C
H
amano
git-merge: squelch ne
e
dless error message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
un
i
o C Hamano
Merge
commit
|
commitdiff
|
tree
2006-12-06
J
u
n
io C H
a
mano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2006-12-06
Ju
n
io C H
a
man
o
git-reset
t
o remove
"
$GIT_DIR/MER
G
E_MSG"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio
C
Hamano
read-tree: document --exc
l
ude-pe
r
-directo
r
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio
C Hamano
L
o
osen "workin
g
f
i
le will be
l
ost" check in
P
orcelain-ish
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Juni
o
C
Hamano
read
-
tre
e
: f
u
r
the
r
loosen
"
wor
k
ing file wi
l
l be lo
s
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
Jun
i
o C H
a
m
ano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-04
Juni
o
C
Ham
a
no
unpac
k
-tree
s
: mak
e
sure "df_confl
i
ct_entry
.
name"
i
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Junio C Hamano
rece
i
ve-pack: do
n
ot insist on
fast-for
w
ard outside
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C H
a
m
a
no
merge-
r
ec
u
r
si
v
e: use xdl_mer
g
e()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Hamano
xmer
g
e: make return
value from
x
dl_
m
erge(
)
more usabl
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Ju
n
io C
H
am
a
no
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-03
Junio C Hamano
git-merge: fix confusion between t
a
g
and
b
ranch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
J
unio
C
H
a
mano
Me
r
ge master
.
kernel
.
o
r
g:/p
u
b/scm/gitk/gitk
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
Mer
g
e
branc
h
'
m
ain
t
'
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
tutorial: talk a
b
out u
s
er
.
name
early and don't start
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
J
unio C Hama
n
o
Me
r
g
e
b
r
anch 'jc/globfetch'
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
Merge bra
n
ch '
m
a
i
n
t
'
commit
|
commitdiff
|
tree
2006-11-29
Junio C Ham
a
no
git blame -C: f
i
x outp
u
t form
a
t tweaks
w
h
e
n
c
rossi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Jun
i
o
C Hamano
cvsi
m
port: style fixup
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
M
e
rge branch
'js/shortlog'
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
Merge branch '
j
c/push-delete-re
f
'
commit
|
commitdiff
|
tree
2006-11-27
Junio C
H
a
mano
Merge branc
h
'jc/merge'
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
git-merge: do not l
e
ak rev-parse out
p
u
t used f
o
r checking
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
git-merge: tigh
t
en error checking
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Junio
C
Haman
o
Merg
e
branc
h
'jc/pack-peeled'
commit
|
commitdiff
|
tree
2006-11-26
Junio C
Haman
o
g
r
ep: do not
s
kip unmerged en
t
ries when gr
e
pping in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-26
Junio C Hamano
Merge b
r
anch 'jn/
w
e
b'
commit
|
commitdiff
|
tree
2006-11-25
Jun
i
o C Haman
o
fetch-pack
:
do not barf
whe
n
d
u
plicate r
e
patte
r
n
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Ju
n
io C Haman
o
git-fetch: allow f
o
rcin
g
glob pattern in refspe
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
J
unio C Hamano
Me
r
g
e
branch 'ma
s
t
e
r' into jc/glo
b
fet
c
h
commit
|
commitdiff
|
tree
2006-11-25
J
un
i
o
C
Hamano
git-f
e
tch: ex
i
t with
non-z
e
ro
s
t
atus
when fast-forwar
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Juni
o
C Hamano
git-
c
ommit: s
h
ow --summa
r
y after successful commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
J
u
nio C Hamano
git
-
s
hort
l
og: m
a
ke
co
m
mon reposit
o
ry prefix configurable
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hamano
git-
s
hort
l
og:
f
ix commo
n
reposito
r
y p
r
ef
i
x abbreviatio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hamano
git-branch -D: m
a
ke it
w
ork even wh
e
n on a ye
t
-
t
o
-
be
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio
C
H
a
mano
git-
c
lone: stop
d
u
mb protocol from copying
r
efs outside
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
J
u
n
io C
Ha
m
ano
gitweb: (styl
e
) use chomp without
parenthes
e
s consi
s
ten
t
ly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Allow git pus
h
to delete
remo
t
e
ref
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio
C Hamano
M
e
rge branch
'jn/
w
eb'
commit
|
commitdiff
|
tree
2006-11-24
J
u
n
i
o C Hamano
M
e
r
ge branch
'
pb/
d
if
f
root'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Merge branc
h
'jc/pa
c
k-heuris
t
ics'
commit
|
commitdiff
|
tree
2006-11-24
Jun
i
o C Hamano
Merg
e
bran
c
h
'
jc/numstat'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Merge b
r
anch 'ap/branch-ref-display'
commit
|
commitdiff
|
tree
2006-11-24
Jun
i
o C Hamano
Merge
bran
c
h 'ap/prune'
commit
|
commitdiff
|
tree
next