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
Merge branch 'maint'
2008-08-21
Junio C Hamano
M
e
r
ge b
r
anch 'mz/push-
v
er
b
o
s
e'
commit
|
commitdiff
|
tree
2008-08-21
J
un
i
o C Ham
a
no
Merge
b
ran
c
h 'jc/index-extended-flags'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge
branch 'c
c
/merge-ba
s
e-many'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
io C Haman
o
Me
r
ge
b
ranch 'jc/test-deepe
r
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge branch
'
js/paralle
l
-te
s
t
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Fix
"
git-merg
e
-s bogo" help text
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
J
uni
o
C Hamano
Update d
r
aft release notes for
1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio
C
Hamano
M
erge branc
h
'm
a
int'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Upd
a
te draft release notes fo
r
1
.
6
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Juni
o
C
H
amano
"git-merge"
:
allow
fa
s
t-forwarding in a st
a
t
-
d
i
rty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
comple
t
ion: fin
d
out supported
m
e
r
ge strategies correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Ham
a
no
for-eac
h
-ref: cope with
tags with
in
c
o
m
plete lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Jun
i
o C
H
amano
diff --check:
d
o
not g
e
t confused by new blank
li
n
es
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Jun
i
o C Hamano
Build-i
n
"git-shell
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
J
u
nio
C Hamano
Merge branch 'bd/diff-strbuf'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
M
e
rge branch 'dp/hash
-
lit
e
rally'
commit
|
commitdiff
|
tree
2008-08-20
Junio C
Hamano
Merge branch 'js
/
checkout-dw
i
m-loca
l
'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Merge branch 'p
h
/ena
b
l
e
-th
r
eaded'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Merge
bran
c
h
'jk/pag
e
r
-
swa
p
'
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
io C Haman
o
Merge branc
h
'rs/im
a
p'
commit
|
commitdiff
|
tree
2008-08-20
Jun
i
o C
Ha
m
ano
M
e
r
ge bran
c
h 'js/mingw-stat'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Ha
m
ano
shell: do
not pl
a
y
duplicated definit
i
o
n games to shrink
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-19
Junio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-19
J
uni
o
C Hama
n
o
compat: intr
o
duce on_
d
i
sk_bytes(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-18
J
u
n
i
o
C Hamano
revis
i
on -
-
simpli
f
y
-merge
s
: make it a
no-op without
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-18
Juni
o
C Hamano
revision --simplify-merges: do not leav
e
commits unprocessed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-18
Junio
C Ham
a
no
Makefile:
A
l
l
o
w CC_LD_DYNPATH to be
o
verriden
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Junio C
H
amano
Start
1
.
6
.
1 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Ju
n
io
C Hamano
S
tart 1
.
6
.
0
.
X maintenance series
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
J
unio C H
a
mano
GIT 1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
Merge git-gu
i
0
.
1
1
.
0
commit
|
commitdiff
|
tree
2008-08-17
J
u
nio C Hamano
Merge bra
n
ch '
a
k/p
4
'
commit
|
commitdiff
|
tree
2008-08-17
J
u
nio C Hamano
tests: use
$TE
S
T_DIRECTORY to refer
to the
t
/ dir
e
ctory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Junio C H
a
mano
index: future proof for
"
ex
t
ended" inde
x
entrie
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
J
u
nio
C Hamano
Merge git:/
/
git
.
ke
r
nel
.
org
/
p
ub/scm/gitk/g
i
tk
commit
|
commitdiff
|
tree
2008-08-14
Junio C
Hamano
revis
i
on --simplif
y
-merges: use decoration instead
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-14
Junio C Hamano
x
d
i
f
f-interface: hide
the whole
"
x
d
i
ff
_
emit_state"
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-14
Junio C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2008-08-13
Junio C Hamano
GIT 1
.
6
.
0-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-13
Junio C Hamano
Merge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2008-08-13
Junio C Hamano
D
o
n
ot talk
about "diff" in rev-list docum
e
ntat
i
on
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-13
Ju
n
io C Ha
m
ano
Merge
git://git
.
bogomi
p
s
.
org/git
-
svn
commit
|
commitdiff
|
tree
2008-08-13
Junio C Hamano
M
e
r
ge bra
n
ch 'jc/post-simplify' into tr/rev-list-d
o
cs
commit
|
commitdiff
|
tree
2008-08-13
J
u
nio C Hamano
Mer
g
e
branc
h
'jc/post-simplify' into tr/filter-branch
commit
|
commitdiff
|
tree
2008-08-12
Junio C
H
ama
n
o
diff --check:
do not un
c
onditionally comp
l
ain a
b
out
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Junio
C
H
a
m
ano
Merge
b
ra
n
ch
'main
t
'
commit
|
commitdiff
|
tree
2008-08-11
Junio
C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2008-08-11
Ju
n
io C
Hamano
Re-fix
r
ev-li
s
t
-options documentatio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-11
J
unio
C
Hamano
M
er
g
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2008-08-11
Junio C Hamano
Fix deleting ref
l
og en
t
ries from HEAD reflog
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-09
J
u
nio
C
Hama
n
o
Update
d
r
a
ft RelNote
s
f
or 1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-09
Junio C Hama
n
o
Merge b
r
an
c
h
'maint'
commit
|
commitdiff
|
tree
2008-08-09
Junio C Hamano
mail
i
nf
o
: fix MIM
E
multi-par
t
message bound
a
ry handling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-08
Junio C
H
a
mano
GIT-
V
E
RSION-GEN: mark the version '
d
irty' only
if there
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-08
Junio C Hamano
asciidoc markup
f
ixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-07
Junio C Ham
a
no
Merge
branc
h
'lt/con
f
i
g-fsync' in
t
o
m
a
int
commit
|
commitdiff
|
tree
2008-08-07
Junio C Hamano
Mer
g
e branch 'jc/reflog-
e
xpire' into maint
commit
|
commitdiff
|
tree
2008-08-07
J
unio C Hamano
Merge branch '
a
g/rewrite
_
one' into m
a
int
commit
|
commitdiff
|
tree
2008-08-06
Junio C Hamano
GIT 1
.
6
.
0
-
rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-06
Junio C Hama
n
o
S
y
n
c with 1
.
5
.
6
.
5
commit
|
commitdiff
|
tree
2008-08-06
Junio C H
a
mano
G
I
T 1
.
5
.
6
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-06
Junio C Haman
o
Files given on
t
he com
m
and line a
r
e
relat
i
ve to $cwd
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-06
Junio C Hamano
M
erge gi
t
://repo
.
or
.
cz/gi
t
-g
u
i
commit
|
commitdiff
|
tree
2008-08-06
J
unio C
H
a
mano
M
erge git://git
.
kernel
.
org/pub/scm
/
g
i
t
k
/
git
k
commit
|
commitdiff
|
tree
2008-08-06
Jun
i
o C Hamano
Me
r
ge branch 'rs/archive
-
parse-op
t
ions'
commit
|
commitdiff
|
tree
2008-08-06
Junio C Hamano
fi
x
diff-tre
e
--stdin documentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-06
Jun
i
o
C
Hamano
M
e
r
ge branch
'
m
ai
n
t'
commit
|
commitdiff
|
tree
2008-08-06
Ju
n
io C
H
amano
Re
l
Not
e
s
1
.
5
.
6
.
5 updates
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-05
J
unio
C Hamano
add: refuse
to add working tree items
b
eyon
d
symli
n
ks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-05
J
u
n
io C Hamano
update-in
d
ex:
refuse
to add working
tree item
s
bey
o
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-04
Juni
o
C Hamano
Topo-sort be
f
o
re --sim
p
lify-merges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-03
Junio
C Hamano
M
erge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-08-02
Junio C Hama
n
o
Merg
e
b
ran
c
h 'maint'
commit
|
commitdiff
|
tree
2008-08-02
Junio C
H
amano
bu
i
ltin-
n
ame-
r
e
v
.
c: split deeply nested part from t
h
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-02
J
unio C Hamano
r
evision
travers
a
l: sho
w
full history
with
mer
g
e s
i
m
p
lificatio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-02
J
u
nio
C
Hamano
revision
.
c: whitespace fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-02
Ju
n
io C Hamano
Merge bra
n
ch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-08-02
Junio C Hamano
Sta
r
t 1
.
5
.
6
.
5 RelNotes to describe
a
ccumulated fix
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-02
J
u
nio C Hamano
Update my e-mail address
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-02
Junio
C Hamano
Documentation: c
l
arify diff --cc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-02
J
un
i
o C Hamano
m
a
k
e
s
ure parsed wild
c
ard refspec ends with slas
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-31
Junio C Hamano
Te
a
ch --find-copies-harder to
"
gi
t
blame"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-30
Junio C Hama
n
o
F
i
x
test
-
parse-options
"i
n
teger" test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-30
Jun
i
o
C H
a
mano
Fix
m
er
g
e name generation in
"merge in C"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-30
Junio C Hamano
git-me
r
ge-octopus: use (merge-base A
(
me
r
ge B
C D
E
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-30
Junio
C Ham
a
no
Merge git:/
/
repo
.
or
.
c
z/git-gui
commit
|
commitdiff
|
tree
2008-07-30
Junio C
H
ama
n
o
Tea
c
h gitlinks
t
o
ie_modif
i
ed()
a
nd ce_modified_check_
f
s(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-30
Junio C Hamano
m
erge
-
base-ma
n
y: add
trivial tests
b
ased on t
h
e docum
e
ntati
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-30
Juni
o
C Hamano
docum
e
ntation: merge
-
base: explain
"git merge-
b
ase
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
Juni
o
C Hamano
t7001:
fi
x
"git
m
v" t
e
st
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
Juni
o
C Hamano
D
o
cumentation:
c
l
arify
w
hat is shown in "git-ls-files
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
Junio C Hamano
ls-tree
documentati
o
n:
enhance notes on subdirectory
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-28
Junio C Hamano
Allo
w
i
nstalling in the t
r
aditio
n
al
way
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-28
Junio C Hamano
Allow build
i
ng without a
n
y git installed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Juni
o
C Hamano
GI
T
1
.
6
.
0-rc
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Juni
o
C Hamano
make
s
u
re parsed wild
c
ard refspec
ends with sl
a
s
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Junio
C Hamano
Me
r
ge git
:
/
/
repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-07-26
Junio C Hamano
imap-send
.
c
: mor
e
st
y
le fixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Junio C H
a
m
a
no
b
u
ilti
n
-add
.
c: optimize -A option and
"
git add
.
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Junio C Ham
a
no
b
u
il
t
i
n-add
.
c
: restructure
the
code for main
t
ainab
i
lity
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next