repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
read-tree -u one-way merge fix to check out locally modified paths.
2006-05-15
Junio C
H
amano
read-tree -u
o
ne-way
m
erge fix to
c
h
ec
k
out
l
ocally
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-14
Ju
n
io
C
Hamano
Merge branch 'fi
x
'
commit
|
commitdiff
|
tree
2006-05-14
Junio C H
a
mano
Merge branch 'ml/cvs'
commit
|
commitdiff
|
tree
2006-05-14
J
u
nio C Hamano
Merge branch 'fix'
commit
|
commitdiff
|
tree
2006-05-10
Junio C
H
am
a
no
Merge br
a
nch 'fix'
commit
|
commitdiff
|
tree
2006-05-10
Junio C Hamano
c
heckout
:
us
e
--aggressi
v
e when runn
i
ng a 3-way merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-09
Junio
C
Hamano
Merge br
a
nch
'
jc/c
l
ean
'
commit
|
commitdiff
|
tree
2006-05-09
Junio C Haman
o
M
erge br
a
nch 'mw
/
al
t
ernates'
commit
|
commitdiff
|
tree
2006-05-09
J
unio C Hamano
Merg
e
branc
h
'jc/
x
s
h
a1'
commit
|
commitdiff
|
tree
2006-05-09
Junio C Hamano
Merge br
a
nc
h
'jc/again'
commit
|
commitdiff
|
tree
2006-05-09
Junio C Hamano
Merge branch
'
np/de
l
ta'
commit
|
commitdiff
|
tree
2006-05-09
Junio
C
Hamano
Merge bra
n
c
h
'jc/bindiff'
commit
|
commitdiff
|
tree
2006-05-09
Jun
i
o C Ha
m
ano
Merge branc
h
'fix'
commit
|
commitdiff
|
tree
2006-05-09
Junio C Hamano
Mer
g
e branch 'tojunio' of http
:
/
/
l
ocke
.
cat
a
lys
t
.
n
et
.
.
.
commit
|
commitdiff
|
tree
2006-05-08
J
u
nio C Hamano
Teac
h
git-c
l
e
a
n optional <paths>
.
.
.
p
aramet
e
rs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-08
Junio C Hamano
Merge bra
n
ch 'fix'
commit
|
commitdiff
|
tree
2006-05-08
Junio C Hama
n
o
get
_
sha1() - fix infinite
loop
o
n nonexistent st
a
ge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-08
Junio C Hamano
Docum
e
ntation: {
c
aret} fixes (git-rev-li
s
t
.
tx
t
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-08
J
unio C Hama
n
o
Fix repo-config set-
m
ultivar error ret
u
rn path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-07
Junio C Hamano
Merge
b
r
anc
h
'fix'
commit
|
commitdiff
|
tree
2006-05-07
J
unio C Ham
a
no
repo-config
:
d
oc
u
ment what v
a
l
ue_regexp do
e
s a bit
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-06
Jun
i
o C Hamano
bi
n
ary diff and apply:
te
s
t
s
uite
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-06
J
u
n
i
o C
Hama
n
o
update-ind
e
x
-
-again:
t
ake optional pathspecs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-06
Junio C Hamano
updat
e
-index --aga
i
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-06
Junio C Hamano
upda
t
e-index: plug mem
o
ry leak fro
m
p
r
efix_path()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-06
Juni
o
C Hamano
c
hec
k
out-
i
ndex: plug mem
o
ry leak f
r
om pr
e
f
ix_pa
t
h()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-06
J
u
nio C Hamano
upd
a
te-index --unres
o
lve: work fro
m
a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-05
Junio C
H
am
a
no
binary d
i
ff: further updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-05
Junio C H
a
mano
binary patch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-05
Junio C Hamano
pa
c
k-obj
e
ct
:
s
quelc
h
eye-candy o
n
n
o
n-tt
y
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-05
Junio C Ham
a
n
o
Merg
e
branch 'fix'
commit
|
commitdiff
|
tree
2006-05-05
Junio C Hamano
core
.
prefersymlin
k
refs: use sym
l
ink
s
for
.
git/HEAD
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-05
Ju
n
io C Ham
a
no
delta: str
i
cte
r
cons
t
ness
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-05
J
u
n
io
C H
a
mano
Mak
e
file:
do not link rev-l
i
st any specially
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-04
Junio C H
a
mano
Merge branch 'jc/l
o
g
s'
commit
|
commitdiff
|
tree
2006-05-04
J
u
nio C Hamano
M
e
rge branch
'
jc/show-bran
c
h-dense'
commit
|
commitdiff
|
tree
2006-05-04
Junio
C
Hamano
M
erge branch 'jc/symref
'
commit
|
commitdiff
|
tree
2006-05-04
J
u
n
io C Hamano
Merg
e
bran
c
h 'jc/diff'
commit
|
commitdiff
|
tree
2006-05-04
Juni
o
C Ha
m
ano
Mer
g
e b
r
an
c
h 'js
/
rep
o
config'
commit
|
commitdiff
|
tree
2006-05-04
Junio C H
a
mano
Mer
g
e
branch '
j
c/count'
commit
|
commitdiff
|
tree
2006-05-04
Junio C Ham
a
no
Merge br
a
n
ch 'js/remotecon
f
ig'
commit
|
commitdiff
|
tree
2006-05-04
Junio C
Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2006-05-04
J
u
nio C
Hamano
Merge branch '
f
ix
'
commit
|
commitdiff
|
tree
2006-05-03
J
unio C Ham
a
no
builtin-co
u
n
t
-
objects: open packs when running -v
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-03
Junio C
H
am
a
no
repo-con
f
ig: readability fixu
p
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-03
Jun
i
o C Hamano
core
.
prefe
r
symlinkr
e
fs: use
s
ymlinks
f
or
.
git/
H
E
AD
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-03
Jun
i
o C Hamano
Merge
g
it://git
.
ker
n
el
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2006-05-02
Junio C Hamano
Merge
b
ranch 'fix'
commit
|
commitdiff
|
tree
2006-05-02
Junio C Hamano
Revert "fetch,
pull
:
a
sk
config for remote
i
nforma
t
ion"
commit
|
commitdiff
|
tree
2006-05-02
Jun
i
o C Hamano
builtin-push: make it offici
a
l
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-02
J
u
nio C
Hamano
s
h
ow
-
branch: omit uninteresting merges
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-02
Junio C Hamano
bui
l
tin-log/w
h
atc
h
anged/show:
m
ake them
o
fficial
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-02
Juni
o
C
H
a
m
ano
builtin-diff: c
a
ll it "git-di
f
f",
really
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-02
Juni
o
C
H
amano
b
u
iltin-count-objects:
m
ake it official
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-02
Junio C H
a
mano
Me
r
g
e branch 'jc/xsha1-2'
commit
|
commitdiff
|
tree
2006-05-02
Ju
n
io C Hama
n
o
M
erg
e
branch 'jc/pack'
commit
|
commitdiff
|
tree
2006-05-02
Junio
C Hamano
Merge
branch
'
jc/pathcheck'
commit
|
commitdiff
|
tree
2006-05-02
Junio C H
a
mano
Mer
g
e branch 'nh
/
fetch-
h
ttp'
commit
|
commitdiff
|
tree
2006-05-02
J
u
nio C Ham
a
n
o
Me
r
ge br
a
nch
'
s
e/rebase
'
commit
|
commitdiff
|
tree
2006-05-01
J
unio C Hamano
get
_
s
h
a
1(): :path an
d
:
[
0
-3]:path
t
o ext
r
a
ct
from index
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-01
Junio
C Hamano
Extend
e
d SHA1 --
"
re
v
^@" syntax
to mean "all parents"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-04-30
J
unio C
Haman
o
F
i
x built
i
n-
p
ush to
h
o
n
or
Push: lines in
r
emotes fi
l
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-04-30
Junio C
Ha
m
a
no
M
e
rge
b
ranch
'fix'
commit
|
commitdiff
|
tree
2006-04-30
Junio C Ha
m
ano
builtin-dif
f
.
c: di
e
()
f
orma
t
t
i
n
g
type fix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-04-29
J
unio C Ham
a
no
bu
i
l
t-in
d
iff: assort
e
d updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-04-29
Junio C
H
a
mano
built-
i
n diff
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-04-28
Junio C Ham
a
n
o
M
erge branch 'f
i
x'
commit
|
commitdiff
|
tree
2006-04-28
Junio C Ham
a
n
o
git-am --
r
esolv
e
d: mor
e
usable error message
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-04-28
Junio C Hamano
built-in cou
n
t
-
objects
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-04-28
Junio C Hamano
pack-obje
c
ts: update size h
e
u
ri
s
tucs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-04-27
Junio
C
Hamano
M
e
rge branch '
f
ix'
commit
|
commitdiff
|
tree
2006-04-27
Junio C Hamano
verify-
p
a
c
k: chec
k
in
t
e
grit
y
i
n
a s
a
ner orde
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-04-27
Junio C Hamano
Merg
e
branch 'pb/config'
commit
|
commitdiff
|
tree
2006-04-27
Junio C Hamano
Merge branch 'jc/d
i
ffsta
t
'
commit
|
commitdiff
|
tree
2006-04-27
J
un
i
o C Hamano
diff-index: fix c
o
m
p
ilation warnings
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-04-27
Junio C Ha
m
a
n
o
t0000-
b
asic: more commit-tree te
s
ts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-04-27
J
unio C Hamano
revision parsing
:
m
a
k
e "rev
-- paths" checks stronger
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-04-27
J
unio C Hamano
Merge bra
n
ch
'
fix'
commit
|
commitdiff
|
tree
2006-04-26
Junio C Hamano
com
m
it-tree
.
c: check_valid() microoptimiza
t
io
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-04-26
J
u
nio
C
H
amano
rebase:
t
ypofix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-04-26
Junio
C
Hamano
comm
i
t-tree: allow
g
eneric obj
e
ct name for
the tree
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-04-26
Ju
n
io
C
Hamano
Makefil
e
: remove and
c
r
e
ate xd
i
ff library from
s
cratch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-04-26
Ju
n
i
o C Hamano
t
0000-basic: Add
l
s-tre
e
recu
r
sive test back
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-04-26
Junio C Hamano
git-cvss
e
r
v
er: typofixes
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-04-26
Junio C Hamano
di
f
f --stat: show c
o
mp
l
ete rewrites consistently
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-04-26
J
unio
C
Hamano
M
e
r
g
e branch 'jc/diff'
commit
|
commitdiff
|
tree
2006-04-26
Junio C Ha
m
a
n
o
Makefile: remove a
n
d create
l
ibgit
.
a
f
rom scratch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-04-25
Junio C Hamano
Merge bra
n
c
h 'fix'
commit
|
commitdiff
|
tree
2006-04-24
J
u
nio C
H
amano
Merg
e
branch
'
ar/chmo
d
-s
e
ries
'
commit
|
commitdiff
|
tree
2006-04-24
Junio C Hamano
M
erge bra
n
c
h '
s
h/daemon'
commit
|
commitdiff
|
tree
2006-04-24
Jun
i
o
C Hamano
Merge branch 'jc/cc
-
stat'
commit
|
commitdiff
|
tree
2006-04-24
J
unio C Hamano
Merge b
r
anch '
j
c/u
n
re
s
o
lve'
commit
|
commitdiff
|
tree
2006-04-24
Junio C Hamano
Me
r
ge bran
c
h '
j
c/col
o
r'
commit
|
commitdiff
|
tree
2006-04-24
Junio
C
Hamano
Merge gi
t
:/
/
git
.
ke
r
nel
.
org/pub/scm/gitk/
g
itk
commit
|
commitdiff
|
tree
2006-04-22
Junio C
Hamano
L
i
bified diff-index: backw
a
rd comp
a
tib
i
l
ity fix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-04-22
Jun
i
o C Hamano
Libify diff
-
ind
e
x
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-04-22
Junio C Hamano
Libify diff-
f
i
les
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-04-22
J
u
nio C Haman
o
Fix "git show --stat
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-04-22
J
unio C Haman
o
Add colordiff for
git to co
n
trib/c
o
l
o
rdif
f
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-04-22
Junio
C Hama
n
o
M
e
r
ge branch 'jc/diff'
commit
|
commitdiff
|
tree
next