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
Revert "Make left-right automatic."
2006-12-19
Junio C Hamano
Revert "Make left-rig
h
t autom
a
tic
.
"
commit
|
commitdiff
|
tree
2006-12-17
Junio
C
Ham
a
no
Ma
k
e left-right a
u
tom
a
tic
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
Tea
c
h all
o
f log family --left-right output
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
J
u
ni
o
C
Ham
a
no
rev-l
i
st -
-
left-right
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
markup fix i
n
s
v
nimport documentat
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C
Hamano
F
ix mis-mark-
u
p
i
n
git-merge-file
.
txt d
o
cume
n
tati
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
J
unio C Hama
n
o
Fix
c
h
e
ck_file_d
i
rectory_conf
l
ict()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Ha
m
ano
git-add:
r
e
m
ove
c
onfli
c
tin
g
e
n
t
r
y when addi
n
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
u
pda
t
e-index: make D/F conflic
t
erro
r
a b
i
t m
o
r
e
verbose
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Jun
i
o
C Hamano
merge
:
g
i
ve
a bit
prettier merge mes
s
a
g
e
to "merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
Mer
g
e
b
ran
c
h '
j
s
/
s
how'
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
git
-
reset [-
-
mixed]
<
t
ree> [--] <pa
t
hs>
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
J
u
nio C Hama
n
o
git-reset: make
it work from
within a subdire
c
tory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio
C
Hamano
git-f
e
tch: make it
w
ork fr
o
m
within
a
su
b
d
i
re
c
tory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
J
u
nio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2006-12-14
J
u
nio C Hamano
Updat
e
git-diff do
c
ument
a
tion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Ju
n
io C Haman
o
M
erge br
a
nc
h
'
j
c/diff--
c
ac
h
ed'
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C Hama
n
o
gi
t
-svn: allo
w
both di
f
f
.
col
o
r and color
.
diff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
co
n
fig d
o
cumentation:
g
roup
color i
t
ems together
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch 'jc/read-tree-ig
n
ore'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
amano
Merge branch '
e
w/rerere
'
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C
Hamano
Merge br
a
nch 'np/addcommit'
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Hamano
Me
r
ge
branch
'lh/br
a
n
c
h-
r
ename'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Mer
g
e branch 'j
c
/comm
i
t-c
a
ref
u
l'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
H
a
mano
Merge branch
'
a
p/clone-orig
i
n
'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch
'
jc
/
num
s
tat'
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Hamano
Merge
b
ranch 'rr/cvsexportc
o
mmit'
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C Ha
m
ano
Merge branch 'ap/b
r
anch'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
Hamano
branch
-
-color: change default color se
l
ecti
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Hamano
Merge b
r
anc
h
'js/
m
erge'
commit
|
commitdiff
|
tree
2006-12-13
J
u
n
i
o C Hamano
sen
d
-pack:
t
i
ghten checks
fo
r
remote names
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C H
a
mano
git-push:
a
c
cept tag
<tag>
as
advertised
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ham
a
no
spurious
.
sp in
m
anpages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Hamano
git merge
:
r
e
word failure message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ham
a
no
Rever
t
"git-diff
:
Introduce --ind
e
x and
d
e
precate
.
.
.
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch
'main
t
'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Haman
o
git
-
push: document r
e
moval of remote ref
with :<dst
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io
C Ha
m
ano
Merge branch
'master
'
into js/m
e
rge
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
amano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io C Ha
m
ano
add
test case for recursive merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Ham
a
no
diff
-
-numstat: show binary with
'
-
'
to matc
h
"apply
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Ju
n
io C H
a
mano
shortlog:
f
ix segfaul
t
on empt
y
a
u
thorn
a
m
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
J
u
nio C Hamano
s
hortlog: r
e
move "[PATCH
]
"
p
ref
i
x from shortlog output
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
J
unio C H
a
mano
Merge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2006-12-10
Ju
n
io C Ha
m
ano
git-comm
i
t: allow --only to los
e
what was staged earlier
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-10
Junio C Hamano
D
ocum
e
ntation/git-commit: rewrite to ma
k
e
i
t more end
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
Junio
C
H
a
m
ano
gi
t
-rerer
e
: add
'gc' co
m
mand
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Junio C Ha
m
ano
Fix perl/ build
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
Junio C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2006-12-06
J
u
nio
C
Ham
a
no
gi
t
-merge: fix "fi
x
c
on
f
usio
n
bet
w
ee
n
tag and branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
u
nio
C
Hamano
git-merge: squelc
h
nee
d
less erro
r
message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Juni
o
C Haman
o
Merge
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
Merge
bran
c
h
'maint'
commit
|
commitdiff
|
tree
2006-12-06
Junio
C
H
amano
g
it-reset to
remov
e
"$GI
T
_D
I
R/MERG
E
_MSG"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
read-tree: d
o
cument -
-
excl
u
de
-
per-dire
c
tory
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Jun
i
o C
H
amano
Loosen "working f
i
le will
b
e
lost" check in Porc
e
lain-ish
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C H
a
mano
re
a
d
-tree
:
f
urther loosen
"
worki
n
g
f
ile will
be lost
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
Junio C Haman
o
Merge branch 'm
a
i
n
t'
commit
|
commitdiff
|
tree
2006-12-04
Junio C
Haman
o
unpac
k
-trees: make sure "df_confl
i
c
t
_entry
.
name" is
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
J
unio
C Hamano
receive-pack: do not insist on
fast
-
forward
outside
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Ha
m
ano
merge-recu
r
s
i
ve: use xdl_m
e
rge()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Hamano
xmerge:
m
a
k
e re
t
ur
n
va
l
u
e fr
o
m xdl_m
e
rge() mo
r
e usable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C
H
amano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2006-12-03
Junio C Hamano
git-
m
erge
:
f
i
x confusion be
t
w
e
e
n
tag and bran
c
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Junio C H
a
mano
Merge ma
s
ter
.
kernel
.
org:/pub/scm/
g
i
t
k/
g
itk
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2006-11-29
Ju
n
io C Ham
a
no
tuto
r
ial: talk about user
.
name early
and don't start
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Ju
n
io C H
a
mano
Merge b
r
a
nch 'jc/globfet
c
h'
commit
|
commitdiff
|
tree
2006-11-29
Junio C
H
a
man
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
git blame
-
C:
f
ix out
p
ut form
a
t tweaks
w
h
e
n c
r
os
s
ing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
J
u
nio C Hamano
cvsi
m
port: style f
i
xu
p
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
J
unio C Hamano
Merge branch 'js/sh
o
rtl
o
g'
commit
|
commitdiff
|
tree
2006-11-27
Juni
o
C Hamano
Merge branch '
j
c
/
p
u
s
h-delete-
r
ef
'
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
Merge branch 'jc/merge'
commit
|
commitdiff
|
tree
2006-11-27
Junio C Ham
a
no
git-merge:
do
n
ot le
a
k rev-parse
output u
s
ed for checking
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
J
u
n
io C
H
amano
git-merge:
ti
g
hten e
r
ror checking
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Junio
C
Ham
a
n
o
M
e
rge branch 'j
c
/pack-p
e
eled
'
commit
|
commitdiff
|
tree
2006-11-26
J
u
nio C
H
am
a
no
grep: do
n
ot sk
i
p
u
nmerged ent
r
ie
s
when grepping in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-26
Ju
n
io C Ha
m
ano
M
erge bra
n
ch 'jn/we
b
'
commit
|
commitdiff
|
tree
2006-11-25
Junio C Ha
m
a
n
o
fetch
-
pack: do not barf
w
hen
dupl
i
cate re patter
n
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio
C Hamano
git-fetc
h
: allow fo
r
cing glob pattern in refs
p
ec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Jun
i
o
C Hamano
Me
r
ge bra
n
ch
'master' into jc/globfet
c
h
commit
|
commitdiff
|
tree
2006-11-25
Ju
n
io C Hamano
git-fetch
:
exit with non-
z
ero status
w
he
n
fast-forward
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C
Ha
m
ano
git
-
commit: sh
o
w
--summary after
s
u
ccess
f
ul com
m
i
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
J
u
n
io C
Hamano
gi
t
-sho
r
t
log
:
m
ake com
m
on repository prefix configurable
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Jun
i
o C
H
amano
g
it-shortlo
g
:
fix common repository prefix a
b
breviation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Jun
i
o C H
a
mano
git-branch -D: make it work ev
e
n w
h
e
n o
n
a yet-to-be
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hamano
git-clone: stop dumb
pr
o
tocol from
c
opyi
n
g refs out
s
ide
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
gitw
e
b: (styl
e
)
us
e
c
homp without parentheses
consistently
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio
C
Hama
n
o
A
llow git
p
ush to delete remote r
e
f
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C
Hamano
Merge branch 'jn/w
e
b'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Merge branch 'pb/d
i
ff
r
oot'
commit
|
commitdiff
|
tree
2006-11-24
Junio C
H
am
a
no
Merge br
a
nch 'jc/pack
-
heuri
s
t
ics'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hama
n
o
Merge branc
h
'
j
c/numstat'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Haman
o
Merge
b
ranch 'ap/
b
r
a
n
c
h
-ref-dis
p
lay'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Merge branch 'a
p
/pr
u
ne'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Typefix
b
ui
l
tin
-
p
r
une
.
c::prune
_
obj
e
ct()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Merge branch 'jc/upload-pack'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Ha
m
ano
r
e
fs outside
r
efs/{he
a
ds,tags} match less
strongly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
gi
t
-fetch: allow gl
o
b
p
attern in refspe
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next