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
bash: Add completion for git diff --base --ours --theirs
2008-04-20
J
u
n
i
o C Haman
o
GIT 1
.
5
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-20
Jun
i
o C H
a
mano
Me
r
ge branch '
j
c/m
a
i
nt-
r
ebase-am' into
ma
i
nt
commit
|
commitdiff
|
tree
2008-04-19
Junio
C Hamano
Me
r
ge branc
h
'
maint-1
.
5
.
4' into ma
i
nt
commit
|
commitdiff
|
tree
2008-04-18
Juni
o
C Hamano
am: POSIX po
r
t
abi
l
ity fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-17
Junio C Hamano
Merge branch 'maint-1
.
5
.
4' in
t
o maint
commit
|
commitdiff
|
tree
2008-04-16
Jun
i
o C Hamano
g
it-am:
mino
r
cleanu
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-16
Ju
n
io C Hamano
rebase:
d
o not munge
commit log
message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-16
Junio C Ham
a
n
o
Merge branch
'
ma
i
nt-1
.
5
.
4' int
o
m
a
i
n
t
commit
|
commitdiff
|
tree
2008-04-13
Junio C Hamano
t7401: squel
c
h garbage o
u
tput
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-13
Juni
o
C Hamano
Documentat
i
on/git-
s
u
b
m
odule: typo
f
ix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-12
Junio C Ha
m
a
no
Merg
e
b
r
anch 'maint-1
.
5
.
4' into maint
commit
|
commitdiff
|
tree
2008-04-12
Jun
i
o C Haman
o
Document -w opti
o
n
to
s
hort
l
og
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-12
Junio C Hamano
Merge
b
r
a
nch 'maint-1
.
5
.
4' into maint
commit
|
commitdiff
|
tree
2008-04-10
Junio C Ham
a
no
Merge branch 'main
t
-1
.
5
.
4
' into
maint
commit
|
commitdiff
|
tree
2008-04-08
Jun
i
o C H
a
mano
GIT 1
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-08
Junio C
H
a
m
ano
Merge
git
:
//git
.
kerne
l
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2008-04-07
Juni
o
C H
a
mano
Me
r
ge
branch
'
j
c
/
m
aint-apply-
m
a
tch-beginning'
commit
|
commitdiff
|
tree
2008-04-07
Ju
n
io C Hamano
F
i
x
"
git ap
p
ly" to correctly
enfo
r
ce "matc
h
a
t
t
he
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-05
Juni
o
C
Ha
m
a
no
Merge git://
r
epo
.
or
.
cz/git
-
gui
commit
|
commitdiff
|
tree
2008-04-02
Jun
i
o C Haman
o
GIT 1
.
5
.
5-
r
c3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-02
Junio C Ha
m
ano
Merge bra
n
ch
'
js/filter
-
b
ranc
h
'
commit
|
commitdiff
|
tree
2008-04-02
Ju
n
io C
Hamano
Merge git://
r
epo
.
or
.
c
z
/
git-gui
commit
|
commitdiff
|
tree
2008-04-02
J
u
nio C Ham
a
no
M
e
rge branch 'bc/
m
kt
a
g'
commit
|
commitdiff
|
tree
2008-04-02
Ju
n
io C Hamano
Merg
e
branch 'pb/cvsserver'
commit
|
commitdiff
|
tree
2008-04-02
Junio C Haman
o
Merge branch 'dd/cvsserver'
commit
|
commitdiff
|
tree
2008-04-02
Junio C Hamano
Merge branch 'je/cvsserve
r
'
commit
|
commitdiff
|
tree
2008-04-02
Junio C Hamano
Acc
e
pt git aliases outsid
e
a gi
t
r
epo
s
itory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-31
Junio C
Ham
a
no
diff-
f
iles:
c
areful when inspecting work tree items
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-31
J
u
nio C Ha
m
an
o
diff-index
:
car
e
ful when inspecting
w
ork
t
ree items
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-31
Junio C Hamano
Add corner ca
s
e t
e
sts for diff-i
n
dex an
d
diff
-
files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-28
Junio
C Ha
m
ano
GI
T
1
.
5
.
5-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-28
Junio C
Hamano
GI
T
1
.
5
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-27
Junio C Hamano
builti
n
-prune: p
r
otect ob
j
ects listed on
t
h
e
comman
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-27
Ju
n
i
o C Hamano
Upda
t
e draft
release notes for 1
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-27
Junio
C Hamano
M
e
rg
e
bran
c
h 'main
t
'
commit
|
commitdiff
|
tree
2008-03-27
Junio
C Hamano
U
p
date d
r
a
ft
r
elease notes for 1
.
5
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-27
Junio C Hamano
Merg
e
bra
n
c
h 'jc/
m
a
int-fetch-regre
s
sion-1
.
5
.
4' into
.
.
.
commit
|
commitdiff
|
tree
2008-03-27
Junio C Hamano
test_
m
ust_fail: 129 is a valid error
code from usage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-26
Junio C Hama
n
o
Merge
branch 'jc/m
a
in
t
-fetch-r
e
gression-1
.
5
.
4'
commit
|
commitdiff
|
tree
2008-03-26
Junio C Ha
m
ano
git-fetch
t
e
s
t
:
test tracking fetc
h
r
e
s
ults, n
o
t just
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-26
J
unio C
H
a
m
ano
r
efsp
e
c: al
l
ow col
o
n-less wil
d
ca
r
d "re
f
s
/
c
a
tegory/*"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-23
Junio C Hamano
GIT 1
.
5
.
5
-
rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-23
Junio C Hamano
gc
-
-
a
uto: raise default
a
uto pack
l
i
mit from
20 to
50
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-23
J
u
n
io
C Hamano
Merge
b
ran
c
h 'git-p4' of git://rep
o
.
or
.
cz/git
/
g
it-p4
commit
|
commitdiff
|
tree
2008-03-23
Junio C
Hamano
r
emo
t
e
.
c: Fix overt
i
ght
r
efspec validation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-19
Juni
o
C Ham
a
no
Fix r
e
ad
-
t
r
ee not to discard e
r
r
ors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-19
Junio C Haman
o
A
d
d
t
est
s
to catch problems with un
-
unlinkab
l
e symlink
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-19
Junio
C Hamano
Test: cat
c
h if
t
r
ash cannot be removed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-19
Junio C Hamano
gi
t
-merge-one-file
:
fix
l
ongs
t
anding stupi
d
thinko
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-17
Junio C
Haman
o
M
erge branch 'jc/make
f
ile'
commit
|
commitdiff
|
tree
2008-03-16
Junio C Hamano
t
1000: use "test_must_f
a
i
l
g
it frotz",
not "! gi
t
frotz"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-16
Junio C Hamano
Upd
a
te draf
t
re
l
ea
s
e
no
t
es for 1
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-16
J
unio C Hamano
Resur
r
e
c
t
git-
r
e
rere to
con
t
r
i
b/examples
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-16
J
unio C Hamano
M
e
r
ge branch
'm
a
int'
commit
|
commitdiff
|
tree
2008-03-16
Junio C Hama
n
o
S
tart
d
r
a
f
t
Rele
a
s
eNotes fo
r
1
.
5
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-16
J
unio C Hamano
r
eb
a
se
-
m:
do
not trigger pre
-
commi
t
verification
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-16
J
unio C Ham
a
no
Merge branch 'mas
t
er' of git://
r
epo
.
o
r
.
cz
/
git-gu
i
commit
|
commitdiff
|
tree
2008-03-16
Junio C Hamano
g
i
t-
g
u
i
: Impr
o
ve
d
ir
e
ctions regarding POT updat
e
in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-15
Junio
C H
a
mano
Redo "add test
_
cmp
func
t
io
n
for test scripts"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-15
Ju
n
i
o
C Haman
o
Merge
branch
'jk/porta
b
l
e
'
commit
|
commitdiff
|
tree
2008-03-15
J
u
n
io C Hamano
Merge b
r
an
c
h 'p
y
/su
b
m
odu
l
e'
commit
|
commitdiff
|
tree
2008-03-15
J
u
n
io C Ha
m
ano
Merge branch 'db/dif
f
-to-fp'
commit
|
commitdiff
|
tree
2008-03-15
J
u
nio
C
Haman
o
Merge
b
ra
n
ch
'cc/hel
p
'
commit
|
commitdiff
|
tree
2008-03-15
Junio C Ham
a
no
Merge
branch
'
m
a
int'
commit
|
commitdiff
|
tree
2008-03-15
Ju
n
i
o
C Hamano
f
o
r
mat-pat
c
h: g
e
n
erate MIME he
a
der as needed even
w
hen
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-15
Ju
n
i
o
C Hamano
Merg
e
bran
c
h
'maint
'
commit
|
commitdiff
|
tree
2008-03-15
Junio C
Ham
a
no
Merge git://g
i
t
.
kernel
.
org/pub/scm
/
g
i
tk
/
g
itk
commit
|
commitdiff
|
tree
2008-03-14
Junio C
Hamano
Merge bra
n
ch 'mr/
a
ut
o
conf-frea
d
'
commit
|
commitdiff
|
tree
2008-03-14
Junio C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2008-03-14
Ju
n
io
C Hamano
Merge branch 'ph/maint-quiltimport' into ma
i
nt
commit
|
commitdiff
|
tree
2008-03-14
Junio C
H
amano
re
a
d-tr
e
e() and unpack_
t
rees()
:
u
s
e cons
i
ste
n
t limi
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-14
Ju
n
io C Ham
a
no
D
ocumentation/git-he
l
p: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Junio C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2008-03-13
J
unio C Hamano
D
o
cumen
t
at
i
on/c
o
nfig
:
typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Ju
n
io C Hamano
qui
l
timport: f
i
x misq
u
oting of parsed -p<n
u
m> parame
t
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Jun
i
o C
H
amano
Make
f
ile: f
l
atten e
n
u
merati
o
n
o
f
headers
,
object
s
an
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Junio C
H
amano
Ma
k
efile:
DIFF_OBJ
S
is not s
p
ecial at all these da
y
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Jun
i
o C Hamano
Merge git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-03-12
Junio C H
a
m
ano
git
-
gui: Simplify MSGFMT se
t
ti
n
g in Makefile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
J
u
nio C Hamano
Merge
b
r
a
n
c
h 'js/remote'
commit
|
commitdiff
|
tree
2008-03-12
Juni
o
C Hamano
M
e
rge branch 'lt/unpack-trees'
commit
|
commitdiff
|
tree
2008-03-12
Junio C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2008-03-11
Junio C Hama
n
o
M
e
r
g
e branch 'jc/cherry-pick' (early
part)
commit
|
commitdiff
|
tree
2008-03-11
Jun
i
o C Ha
m
ano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-03-11
Junio C Ha
m
ano
Merge branch
'kb/main
t
-
fil
t
er-branch-di
s
appear' into
.
.
.
commit
|
commitdiff
|
tree
2008-03-11
Junio C
H
ama
n
o
Merg
e
branch 'aw/
m
a
i
n
t
-shortlog-
b
lank-lines' into
m
aint
commit
|
commitdiff
|
tree
2008-03-10
J
u
nio C Hamano
t
r
averse_trees_recursive()
:
propagate me
r
g
e erro
r
s up
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-10
Juni
o
C Haman
o
g
i
t-pu
l
l docu
m
e
ntation:
warn
about the op
t
ion or
d
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Junio
C
Hamano
M
e
rge branch 'p
h
/parseopt'
commit
|
commitdiff
|
tree
2008-03-09
Ju
n
io C Ha
m
ano
Merge b
r
anc
h
'dp/clean-fix'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
Merge branch 'ml/submodule-add-existi
n
g'
commit
|
commitdiff
|
tree
2008-03-09
Jun
i
o C Hamano
Me
r
ge branc
h
'mr/compat-s
n
printf'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
M
e
rge
b
ranc
h
'sp/fetch-optim'
commit
|
commitdiff
|
tree
2008-03-09
Junio
C Ha
m
a
n
o
Merge
branch
'
jc/descri
b
e-alwa
y
s'
commit
|
commitdiff
|
tree
2008-03-09
Junio
C
Hamano
Merge branch
'
jc
/
am'
commit
|
commitdiff
|
tree
2008-03-09
Junio C
Hamano
M
e
rge
b
ran
c
h 'cr
/
reset-pa
r
seopt'
commit
|
commitdiff
|
tree
2008-03-09
J
u
n
io C Hamano
Merg
e
bra
n
ch '
j
n/gitwe
b
-pickaxe'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
Merge branch 'kb/maint
-
filter-bran
c
h-di
s
appear'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
M
e
rge
branch 'maint' to
s
y
n
c
with 1
.
5
.
4
.
4
commit
|
commitdiff
|
tree
2008-03-09
Jun
i
o
C
H
amano
GIT 1
.
5
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next