repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'cc/merge-base-many'
2008-08-21
Junio C Hamano
Merg
e
branch 'cc/merge-base-many'
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o
C H
a
m
a
no
M
e
rge bran
c
h
'jc/t
e
st-deeper'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
H
aman
o
Merge
branch
'js/parallel-test'
commit
|
commitdiff
|
tree
2008-08-20
J
u
nio C Hamano
U
p
date draft
r
e
l
e
a
se notes fo
r
1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio
C
Hama
n
o
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-20
Junio C
Hamano
Update
d
raft
release notes
f
or 1
.
6
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
"
g
i
t
-
merge": all
o
w
f
a
s
t-forwarding in a
s
t
at-dir
t
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
J
u
nio C
Hama
n
o
completion: find out
supported merge strategies correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
J
unio C Hamano
for-each-ref:
cop
e
with tags wi
t
h incomplete lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
J
uni
o
C Hamano
di
f
f
--chec
k
: do no
t
ge
t
confused
b
y
n
e
w
bl
a
nk lines
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
J
un
i
o C Hama
n
o
Merge bra
n
ch 'bd/diff-strbuf'
commit
|
commitdiff
|
tree
2008-08-20
Juni
o
C Hamano
Merge branch 'dp/
h
ash-
l
iterally
'
commit
|
commitdiff
|
tree
2008-08-20
Junio
C
Hamano
Merge b
r
anch
'js
/
c
heckout-dwim-loc
a
l'
commit
|
commitdiff
|
tree
2008-08-20
Junio
C Hamano
Merge bran
c
h 'ph/enab
l
e-threaded'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hama
n
o
Merge branch 'jk/pager-swap'
commit
|
commitdiff
|
tree
2008-08-20
Junio
C
H
amano
Merge branch 'rs/ima
p
'
commit
|
commitdiff
|
tree
2008-08-20
Jun
i
o
C
Hamano
Mer
g
e
branch 'js/mi
n
gw-st
a
t'
commit
|
commitdiff
|
tree
2008-08-19
J
uni
o
C
H
a
mano
Me
r
ge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2008-08-19
Junio C Hamano
compat:
introduce on_di
s
k_
b
yt
e
s()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
J
u
nio C Hamano
Start 1
.
6
.
1 c
y
cle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Ham
a
no
Start 1
.
6
.
0
.
X maint
e
nance s
e
r
i
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Junio C
Hamano
G
IT 1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Ju
n
i
o
C Hamano
Merge git-gui 0
.
11
.
0
commit
|
commitdiff
|
tree
2008-08-17
Junio
C
Hamano
Merge br
a
nch 'ak/p
4
'
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
tests: use $TEST_DIREC
T
ORY to refer t
o
the t/ direc
t
ory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
J
unio C
Hamano
Me
r
ge git://git
.
kerne
l
.
org/p
u
b/scm/git
k
/gitk
commit
|
commitdiff
|
tree
2008-08-14
Junio
C H
a
mano
xdiff-interface: hide the whole "xdiff_emit_state
"
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-14
Junio C Hamano
Merg
e
branc
h
'maint'
commit
|
commitdiff
|
tree
2008-08-13
Junio C
H
aman
o
GIT 1
.
6
.
0-
r
c3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-13
Junio
C
Hamano
M
e
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2008-08-13
Juni
o
C
H
ama
n
o
Do
n
ot ta
l
k
a
bout "
d
if
f
"
in
r
e
v-lis
t
documentation
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-13
Junio C Hamano
Me
r
ge git://git
.
bog
o
mips
.
org/git-
s
vn
commit
|
commitdiff
|
tree
2008-08-12
Junio
C
Hama
n
o
diff --check: do not u
n
c
o
ndit
i
onally comp
l
ain about
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Junio C Hamano
Merge br
a
nch '
m
a
int'
commit
|
commitdiff
|
tree
2008-08-11
J
unio C Ham
a
no
Merge b
r
anch 'main
t
'
commit
|
commitdiff
|
tree
2008-08-11
J
u
n
i
o
C Hamano
Re-fix rev
-
list-options docu
m
entation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-11
Junio
C Hama
n
o
M
e
rge branch 'm
a
i
nt'
commit
|
commitdiff
|
tree
2008-08-11
Junio C Ha
m
a
n
o
Fix
d
e
l
e
ting r
e
flog
e
n
tries from
HEAD
reflog
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-09
Ju
n
io C Hamano
Update draf
t
R
e
lNotes for 1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-09
Jun
i
o C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-09
Junio
C Hama
n
o
mailinfo:
f
ix MIME multi-part message
bo
u
ndary handling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-08
Junio C Ha
m
ano
GIT-VE
R
S
I
ON-GEN: mark the v
e
rsio
n
'dirty'
o
nly if th
e
r
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-08
Junio
C Hamano
asc
i
idoc markup fixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-07
Junio
C
Ha
m
ano
Merge branch 'lt/con
f
ig-fsync' into maint
commit
|
commitdiff
|
tree
2008-08-07
Junio C H
a
mano
Merge br
a
nc
h
'jc
/
reflo
g
-
e
xpire' into
m
aint
commit
|
commitdiff
|
tree
2008-08-07
Juni
o
C
H
amano
Merge branch 'ag/rewri
t
e_one' into
maint
commit
|
commitdiff
|
tree
2008-08-06
Junio C Hamano
GIT 1
.
6
.
0-
r
c2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-06
Junio C Ha
m
a
no
Sync with 1
.
5
.
6
.
5
commit
|
commitdiff
|
tree
2008-08-06
J
unio C
H
amano
GIT 1
.
5
.
6
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-06
J
unio
C Hamano
Files giv
e
n on th
e
c
omma
n
d
l
i
ne are rel
a
t
i
v
e
t
o
$
c
w
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-06
J
un
i
o C Hamano
Merg
e
git://rep
o
.
o
r
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-08-06
Jun
i
o C Ham
a
no
Merge g
i
t:/
/
git
.
kern
e
l
.
org/pub/scm/git
k
/g
i
tk
commit
|
commitdiff
|
tree
2008-08-06
Junio C Hamano
Merge bran
c
h 'rs/archive-pars
e
-
o
pt
i
ons'
commit
|
commitdiff
|
tree
2008-08-06
Junio C Hamano
fix diff-tree
-
-s
t
d
in documentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-06
Ju
n
io
C
Hamano
M
e
rge
b
ranch
'
maint'
commit
|
commitdiff
|
tree
2008-08-06
Junio C Hamano
RelNot
e
s
1
.
5
.
6
.
5 updates
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-03
Junio C Hama
n
o
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2008-08-02
Jun
i
o C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2008-08-02
J
u
nio C Hamano
b
uiltin-name
-
rev
.
c
:
split deeply n
e
sted
p
a
r
t from the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-02
Junio C Ha
m
ano
M
e
rge branc
h
'maint'
commit
|
commitdiff
|
tree
2008-08-02
Jun
i
o
C Ham
a
no
S
t
ar
t
1
.
5
.
6
.
5 RelN
o
tes to describe accumulated fixe
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-02
J
u
nio C Ha
m
ano
Update my e-mail
address
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-02
Junio C Hamano
Docu
m
entation: clari
f
y
diff
-
-c
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-02
Junio C Hama
n
o
make sure parse
d
wil
d
c
a
rd refs
p
ec en
d
s
with slash
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-31
Junio C Haman
o
Teach --find-copies-
h
a
r
d
e
r
t
o
"
gi
t
bla
m
e"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-30
Junio C Hamano
F
i
x
te
s
t-parse-op
t
i
o
n
s "integer" test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-30
Junio
C Hamano
Fix m
e
r
ge
name generation in "me
r
ge in
C
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-30
Junio C Ha
m
ano
git-merge-octopus:
u
se (merge-b
a
s
e
A
(
m
erg
e
B C D
E
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-30
Junio C Ha
m
ano
Me
r
ge git://r
e
po
.
or
.
cz/gi
t
-
gui
commit
|
commitdiff
|
tree
2008-07-30
Junio C Hamano
Teach gi
t
lin
k
s t
o
ie_modified() and ce_mo
d
ified_check_fs()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-30
Junio C Hamano
merge-base-m
a
ny: add tri
v
ial tes
t
s
based on the docum
e
nt
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-30
J
u
nio C Hamano
documen
t
atio
n
: merge
-
b
a
s
e
: explain
"git merge-base
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
Junio C Hamano
t7
0
01: fix
"
g
it mv" test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
Junio C
H
amano
Documentat
i
on: clarify
wh
a
t is shown in "g
i
t-ls-files
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
Ju
n
io C Hamano
ls-
t
ree docume
n
tation: en
h
anc
e
notes on subdirect
o
ry
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-28
Junio C
Ha
m
ano
Allow ins
t
alling in the trad
i
tional way
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-28
J
un
i
o C
H
amano
Allow building with
o
ut any git installed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Junio
C H
a
mano
G
IT 1
.
6
.
0-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Junio
C
Hamano
make sur
e
pa
r
sed wildcard refspec ends w
i
th slash
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Junio
C
Hamano
Merge git://rep
o
.
o
r
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-07-26
J
unio C
Ham
a
no
ima
p
-
s
end
.
c: more style
f
ixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
Junio
C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2008-07-25
J
unio C Hama
n
o
D
o
cumentatio
n
:
c
lari
f
y
h
ow to dis
a
ble ele
m
en
t
s in cor
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
Junio C
Hamano
Makefile: fix shell
qu
o
ting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
Junio C Hamano
tests:
pr
o
p
a
gate
$
(TAR) down
f
r
om the top
l
e
vel Mak
e
file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
J
uni
o
C Hamano
Merg
e
branch 'ph
/
check
o
ut'
commit
|
commitdiff
|
tree
2008-07-24
J
unio
C
Haman
o
Merge
branch 'maint' into ph/
c
h
eckout
commit
|
commitdiff
|
tree
2008-07-24
J
uni
o
C
H
am
a
no
i
gnore non-existent refs
in d
w
im_log()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Junio C H
a
mano
Documentation: clarify diff
--
c
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Jun
i
o C Hamano
builtin-branch
.
c
: op
t
i
m
ize --
m
erged
and --no-
m
erged
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
J
unio C Ha
m
an
o
b
u
iltin-
b
ranch
.
c
: r
e
mo
v
e
unus
e
d code
in append_ref
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Junio C
Hamano
stash save: fix pa
r
ameter handling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Ju
n
io C Ha
m
ano
t
ests: do
n
ot rely on external "patch"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Junio C
Hamano
R
e
ver
t
"make git-status us
e
a
pager"
commit
|
commitdiff
|
tree
2008-07-21
Ju
n
io
C
Hamano
Update my e-mail address
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-21
Junio C Hamano
Merge
b
ranch 'ap/trackinfo'
commit
|
commitdiff
|
tree
2008-07-21
Junio
C Hamano
Merge bran
c
h 'jc/rerere-auto-m
o
re'
commit
|
commitdiff
|
tree
2008-07-21
Junio C Hamano
M
e
rge
b
ranc
h
'
ns/am-a
b
ort'
commit
|
commitdiff
|
tree
2008-07-21
Junio C Hamano
Merge branch '
j
c/
a
dd-addremove'
commit
|
commitdiff
|
tree
2008-07-21
Junio
C Haman
o
"
needs up
d
ate" conside
r
ed
har
m
ful
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next