repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Teach git-branch to delete tracking branches with -r -d
2006-12-19
Junio C
Hamano
Teach
git-branch to delet
e
tracking branches wi
t
h
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
Ju
n
io C Hamano
re
r
ere
:
f
i
x br
e
akage of resolving
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Junio C
H
amano
r
acy-
g
it: do
c
umentation update
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Ju
n
io C Hamano
sh
o
w-ref: f
i
x --exclude-
e
xisting
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Junio
C Hamano
pa
r
se
-
remote:
:
expand_
r
efs_
w
ildc
a
rd()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
J
u
nio C Ham
a
no
sh
o
w
-
ref:
f
ix --v
e
rify --hash=le
n
gth
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Junio C
Hamano
show-re
f
: fix --qui
e
t --v
e
rify
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
J
uni
o
C Ha
m
ano
Merge branch 'jc/blam
e
-boun
d
ary'
commit
|
commitdiff
|
tree
2006-12-18
J
u
nio
C Hamano
Merge branch 'jc/reflog' (early part)
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
Merge br
a
nch 'j
s
/
b
ra
n
c
h
-c
o
nfig'
commit
|
commitdiff
|
tree
2006-12-18
Junio C Haman
o
Me
r
ge branch '
j
n/
w
eb' (early part)
commit
|
commitdiff
|
tree
2006-12-18
Juni
o
C
Ha
m
an
o
avoid acc
e
ssi
n
g _a
l
l_ loose
ref
s
in gi
t
-sh
o
w-ref -
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Junio
C Ham
a
no
git-fetch: Avoid reading packed refs ove
r
an
d
over
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Ju
n
i
o C Hamano
Teach show-branch how to
s
how re
f
-log data
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hama
n
o
ma
r
k
up fi
x
in svnimport
doc
u
men
t
ation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
Fix mis-mark-up in g
i
t-merge-f
i
l
e
.
txt d
o
c
u
mentation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
F
i
x check_file_directory_
c
onflict()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Juni
o
C Haman
o
git-add: remove conflicting entry w
h
en
a
dding
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio
C
Ha
m
ano
upd
a
te-index
:
make D
/
F
conflict
e
rro
r
a bit more v
e
rbose
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
J
u
nio C H
a
ma
n
o
merge: gi
v
e a bit
p
r
ettier
me
r
ge message
t
o
"
merg
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Ha
m
ano
Me
r
ge branch 'js/show'
commit
|
commitdiff
|
tree
2006-12-14
Junio C H
a
mano
g
it-res
e
t
[
--mixed]
<t
r
e
e> [--] <pat
h
s
>
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hama
n
o
git-reset: make it work from
w
i
th
i
n
a
s
ubdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-14
J
unio C Hamano
git-f
e
tch: make it
w
ork f
r
om within a su
b
direc
t
ory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-14
Junio
C
H
am
a
no
M
e
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2006-12-14
Junio C Ham
a
n
o
U
p
date git-diff documentat
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-14
Junio
C
Hamano
Merge branch 'j
c
/diff--ca
c
hed'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C Ha
m
ano
git-svn: a
l
low both diff
.
color an
d
color
.
diff
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
a
mano
config
docum
e
n
t
ation: gr
o
up color items togethe
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
Hamano
git-
b
lame: s
h
ow lines
a
t
t
r
ibuted to boun
d
ary comm
i
ts
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Haman
o
Merge branch 'j
c
/
read-tree-ignore'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C Hamano
M
e
rge branch 'ew/rerere'
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Hamano
Merge branch 'np/addcommit
'
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C
Hamano
M
e
rge branch 'lh
/
branch-rename
'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch 'jc/commi
t
-careful'
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Hama
n
o
Merge branch 'ap/clone-
o
rigin'
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Hamano
Merge branch 'jc/
n
umstat'
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Hamano
Merge branch
'
r
r/cvsexpor
t
commit'
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C
H
amano
Merge branch 'ap/branch
'
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io C
H
amano
bra
n
ch --color: change default color se
l
ection
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio
C Ham
a
no
Merge b
r
a
n
c
h
'js/merge'
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Hamano
send-pack: tighten check
s
for remo
t
e
name
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
git-push: accept tag <ta
g
>
as adve
r
tised
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hama
n
o
spuri
o
us
.
sp in manpages
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio
C Hamano
g
i
t
merge:
r
ewo
r
d
f
ailure mes
s
age
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hama
n
o
R
evert "git-diff: Introduc
e
--ind
e
x and deprecate
.
.
.
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2006-12-13
J
unio C
Haman
o
git-p
u
sh: documen
t
removal
o
f remote ref wi
t
h :<dst
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ham
a
n
o
Merge branch 'mas
t
e
r' into js/mer
g
e
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
M
e
rge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
amano
add t
e
st
c
ase
f
o
r recursive merg
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hama
n
o
diff
--numstat: show b
i
n
a
ry with '-' to match "
a
pply
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Junio C H
a
mano
s
hortlog: fix seg
f
ault
o
n
e
m
pty author
n
ame
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Junio
C
H
a
mano
short
l
og: remove "[PATCH]
"
p
refix fr
o
m sh
o
rtlo
g
output
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hamano
Merge
bra
n
ch 'm
a
int'
commit
|
commitdiff
|
tree
2006-12-10
J
u
n
io C
Hamano
git-commit: allow --only
t
o
l
ose wha
t
wa
s
staged
e
arlier
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-10
Junio
C
Ha
m
ano
Doc
u
mentatio
n
/git-
c
ommit:
rewrite to
make it mor
e
end
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-09
Ju
n
io C H
a
m
ano
g
it-rerere:
a
dd '
g
c' command
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-08
Junio C Hamano
Fi
x
perl/ b
u
ild
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-07
J
unio C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-06
J
unio C Hamano
git-
m
erge: fix "fi
x
confusion between tag and branch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Juni
o
C
Hamano
g
it-m
e
r
g
e:
s
quel
c
h
n
e
edless error m
e
s
s
age
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
J
unio C Ham
a
no
Me
r
ge
commit
|
commitdiff
|
tree
2006-12-06
Juni
o
C Hamano
Mer
g
e branch 'ma
i
nt
'
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
git-reset to remove "$GIT_DIR/MERGE_MSG"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Junio C
H
am
a
n
o
rea
d
-tre
e
:
d
o
c
ument --ex
c
lude-pe
r
-
directory
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
Loosen
"
work
i
n
g
file will be lost
"
check in
P
o
rcelain-ish
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Ju
n
io C Hamano
re
a
d-tree: f
u
r
t
her loosen "working file will be l
o
st
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-05
Jun
i
o
C
Haman
o
Merg
e
br
a
nc
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2006-12-04
Juni
o
C Haman
o
unpack-trees: make sure
"
d
f_co
n
fli
c
t_ent
r
y
.
n
ame"
i
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-04
Junio C Hamano
re
c
eive
-
pack: do
not insist on fa
s
t
-
forward o
u
tside
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Jun
i
o C Hamano
merge-recursive: use
x
dl
_
merg
e
()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
J
unio C Hamano
xmerge
:
make return val
u
e from
xdl_merge(
)
more usab
l
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Juni
o
C
Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2006-12-03
Jun
i
o C
H
amano
git-merge
:
fix confusi
o
n betw
e
e
n tag
a
n
d branch
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Juni
o
C H
a
ma
n
o
M
e
rge master
.
kerne
l
.
org:
/
pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2006-11-29
Junio
C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
tuto
r
ial: tal
k
about user
.
n
a
me e
a
rly
and don't start
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
J
unio C Haman
o
M
e
rg
e
branc
h
'jc/globfetch'
commit
|
commitdiff
|
tree
2006-11-29
J
unio C
H
a
m
ano
Me
r
ge
b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2006-11-29
Ju
n
i
o C Hamano
g
it b
l
ame -C: fix output format
t
w
e
a
ks when crossing
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Jun
i
o C
Hamano
cvsimport: style
f
ixup
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
J
unio C Hamano
M
e
r
ge branch 'js/shor
t
log'
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
Merge branch 'jc/pu
s
h
-
delete-ref'
commit
|
commitdiff
|
tree
2006-11-27
Ju
n
i
o
C Hamano
Merge bran
c
h 'jc
/
me
r
ge'
commit
|
commitdiff
|
tree
2006-11-27
Junio C Haman
o
git-
m
e
r
g
e
: do not leak
rev-parse output used
f
or checking
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Jun
i
o C H
a
m
a
n
o
git-merge: tighten
e
rror checki
n
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
J
u
nio C Hama
n
o
Merg
e
branch 'j
c
/
p
ack-peeled
'
commit
|
commitdiff
|
tree
2006-11-26
Junio
C
Haman
o
grep: do not skip
unmerged en
t
ries when greppi
n
g i
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-26
Junio
C
Hamano
Merge branch 'jn/web'
commit
|
commitdiff
|
tree
2006-11-25
Ju
n
i
o
C
H
a
m
a
no
f
etch-pack: do
not b
a
rf when
d
uplic
a
te re pat
t
e
r
ns
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hamano
git-fetch:
a
l
low
forcing glob
p
attern
i
n re
f
spec
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
J
u
nio C
Hamano
Merge branch '
m
aster' into jc/globfetch
commit
|
commitdiff
|
tree
2006-11-25
J
unio C
H
amano
g
i
t-
f
etc
h
: exit with n
o
n-zero
status when fast-forward
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio
C Hamano
git
-
commit: show
--summary af
t
er
s
u
ccessful
c
o
m
mit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio C
H
amano
git-shortlog: ma
k
e c
o
mmo
n
reposito
r
y prefix configurable
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hamano
gi
t
-shortlog: fix common repositor
y
p
r
efix abbreviation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Ju
n
io C
H
am
a
no
git-branch -D: make it work even wh
e
n on
a
yet-to-be
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hamano
git-clon
e
: sto
p
dumb protocol f
r
om copy
i
n
g refs outside
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Ju
n
io C Hamano
gitwe
b
:
(style) use chomp without p
a
re
n
these
s
consist
e
ntly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next