repo.or.cz
/
git
/
gitweb-caching.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 Ha
m
ano
Me
r
ge branch 'cc/merge-base-many'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge
br
a
nch 'jc/test-deeper'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Ham
a
n
o
Me
r
ge bra
n
ch
'
js/parallel-t
e
st'
commit
|
commitdiff
|
tree
2008-08-20
Junio C H
a
ma
n
o
Update draft
release notes for 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
u
nio C
H
a
m
an
o
Merge branc
h
'ma
i
nt
'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Ham
a
no
U
pdate draft
r
elease notes f
o
r
1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jun
i
o C Hamano
"git-merge":
a
llow fast-fo
r
warding
in a s
t
at-dirty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
unio
C Hamano
completion: find
o
ut supported merge st
r
a
t
egies c
o
r
r
ectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Ham
a
no
for-each-ref:
cop
e
w
i
th
t
ags with incomp
l
ete lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
di
f
f --chec
k
: do not get co
n
fused by new
blank l
i
nes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Haman
o
Mer
g
e
branch 'bd/diff-st
r
buf'
commit
|
commitdiff
|
tree
2008-08-20
Junio
C Hama
n
o
Merge
b
ranch '
d
p/h
a
sh-literally'
commit
|
commitdiff
|
tree
2008-08-20
Junio C H
a
mano
Merge branch '
j
s/ch
e
ckout-dwim-loc
a
l'
commit
|
commitdiff
|
tree
2008-08-20
Junio C
Hamano
Mer
g
e branch 'ph/enable-thr
e
ade
d
'
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
io C Ha
m
ano
M
erge
b
r
a
nch 'jk/pager
-
s
w
a
p
'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Me
r
ge branch
'rs/imap'
commit
|
commitdiff
|
tree
2008-08-20
Junio
C Ham
a
no
M
erge branch
'
js
/
m
i
ngw
-
s
tat'
commit
|
commitdiff
|
tree
2008-08-19
Junio
C Ha
m
ano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2008-08-19
Junio C Hama
n
o
compat: introduce on_disk_by
t
es(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Jun
i
o
C Haman
o
Start 1
.
6
.
1 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
J
unio C H
a
mano
Star
t
1
.
6
.
0
.
X maint
e
nance
series
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
G
I
T
1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Ha
m
ano
M
e
r
ge
git-gui 0
.
11
.
0
commit
|
commitdiff
|
tree
2008-08-17
Ju
n
i
o
C H
a
mano
Merge bran
c
h
'ak
/
p4'
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
tests: use $TES
T
_DIRECTORY to refer to
t
he t/ di
r
e
ctory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
Merge git://git
.
kernel
.
org/pub/scm/gitk
/
gitk
commit
|
commitdiff
|
tree
2008-08-14
Junio C
H
a
m
a
no
xdiff-interfac
e
: hide the whole "xd
i
ff
_
emit_st
a
te"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
J
u
nio
C
Hamano
Mer
g
e b
r
anch 'm
a
int'
commit
|
commitdiff
|
tree
2008-08-13
Ju
n
io
C Hamano
GIT 1
.
6
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
Ju
n
io C
H
a
mano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-08-13
Junio C Hamano
Do not talk about "diff" in rev-list docum
e
nt
a
tion
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
J
u
nio C Hamano
Merge git
:
//git
.
bogomips
.
o
r
g/git-svn
commit
|
commitdiff
|
tree
2008-08-12
Junio C Ha
m
ano
di
f
f
--
c
hec
k
: do no
t
uncondi
t
ionally
co
m
plain about
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Junio C H
a
ma
n
o
Merge bra
n
ch
'
m
aint'
commit
|
commitdiff
|
tree
2008-08-11
Junio C Ham
a
no
Merge bran
c
h 'main
t
'
commit
|
commitdiff
|
tree
2008-08-11
Junio C
Ha
m
ano
Re-fix rev-list-
o
ptions documentat
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
J
u
n
io C Hamano
Mer
g
e
b
ra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-08-11
Junio C H
a
mano
Fix del
e
t
i
ng ref
l
og entries fr
o
m HEA
D
reflog
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-09
Junio
C
Hamano
U
p
date
draf
t
Re
l
N
otes for 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-09
Junio C Ha
m
ano
Merge
b
ranch
'
maint'
commit
|
commitdiff
|
tree
2008-08-09
J
unio C
Hamano
m
a
i
linfo: fix M
I
ME multi-part message bou
n
dary h
a
ndling
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
'
dir
t
y
'
o
nly if there
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-08
Junio C Ham
a
n
o
asciidoc
m
a
r
kup
fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-07
Jun
i
o C Hamano
M
e
rge
b
ranch 'lt/conf
i
g
-fs
y
nc'
i
nto maint
commit
|
commitdiff
|
tree
2008-08-07
Juni
o
C Hamano
Merge branch 'jc/reflog-expi
r
e' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2008-08-07
Juni
o
C Hamano
M
erge branch 'ag/rewrite_one' into
ma
i
nt
commit
|
commitdiff
|
tree
2008-08-06
J
uni
o
C
Hamano
G
I
T
1
.
6
.
0-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-06
J
u
n
io C Ha
m
a
no
Sync with 1
.
5
.
6
.
5
commit
|
commitdiff
|
tree
2008-08-06
Junio C Hamano
GIT 1
.
5
.
6
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-06
Junio C Hamano
Files giv
e
n o
n
the command line a
r
e re
l
ati
v
e
to $c
w
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-06
Junio C Hamano
Merge git://repo
.
o
r
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-08-06
Junio C H
a
mano
Merge git:/
/
git
.
kern
e
l
.
org/pub/scm/g
i
tk/git
k
commit
|
commitdiff
|
tree
2008-08-06
J
u
nio C Hamano
Merge branch 'rs/archive-parse-options'
commit
|
commitdiff
|
tree
2008-08-06
Jun
i
o C H
a
ma
n
o
f
i
x di
f
f-tree -
-
stdi
n
documentat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-06
Junio
C
Ha
m
ano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-08-06
Junio C
H
a
mano
RelN
o
tes 1
.
5
.
6
.
5 upda
t
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-03
Junio
C
H
amano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-08-02
J
unio C
H
amano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-08-02
Jun
i
o C H
a
mano
b
uiltin-name-rev
.
c: split deeply ne
s
ted part from
the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-02
Junio C Haman
o
Merge br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2008-08-02
Jun
i
o C
Hamano
Start 1
.
5
.
6
.
5
R
e
lNotes
t
o de
s
cribe accumulated f
i
xes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-02
Junio C Ham
a
no
U
p
dat
e
my e-mail addres
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-02
Junio C Hama
n
o
Documentatio
n
: cl
a
ri
f
y diff --cc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-02
Ju
n
io
C
Hamano
m
ake sure parsed wildcard refs
p
ec ends with slash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-31
Junio C Hamano
Teach -
-
find-copi
e
s-harder to
"
git
blame"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
J
unio C Hamano
Fix test-parse-op
t
ions "i
n
tege
r
"
t
est
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
Ju
n
i
o
C
Haman
o
F
i
x
m
erge name gener
a
tion
i
n "merge in C"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
J
un
i
o C
Ha
m
a
n
o
git-mer
g
e
-o
c
topus: use (
m
erge-base A (merge B C D
E
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
Ju
n
io C Hamano
Merge
git://repo
.
o
r
.
cz/git
-
gui
commit
|
commitdiff
|
tree
2008-07-30
Jun
i
o C Hamano
Teac
h
gi
t
links to
ie
_
m
o
difie
d
()
and ce_modif
i
ed
_
check_fs()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
Junio
C
Ham
a
n
o
merge-base-many: ad
d
trivial tests b
a
s
e
d
on the docu
m
entation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
Junio C
H
amano
document
a
tion: merge-base: explain "git merge-bas
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Junio
C H
a
man
o
t
7001:
fix "git mv"
t
e
st
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
J
u
nio C
Hamano
Do
c
u
mentation: clar
i
fy what is s
h
own
in
"
git-ls-files
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
J
u
nio
C
Hamano
ls-tree documenta
t
ion: enha
n
ce notes on
subdirect
o
ry
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-28
Ju
n
i
o C
Hama
n
o
Allow installing in the traditio
n
al way
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-28
Junio C Hamano
Allo
w
bui
l
ding without any git instal
l
ed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Junio
C
Hamano
GIT 1
.
6
.
0
-
rc
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
J
u
nio C Ham
a
no
make sure parsed
wildcard
r
efsp
e
c ends with
s
lash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Junio C Hama
n
o
Merge git://re
p
o
.
or
.
c
z
/
g
i
t
-
g
u
i
commit
|
commitdiff
|
tree
2008-07-26
J
u
nio C Hamano
imap-send
.
c: more s
t
yle fixe
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Junio C
H
amano
Merge
b
ra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-07-25
J
u
n
io C Hamano
Documentat
i
on: clarify how
t
o
d
isable el
e
ment
s
in core
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
J
unio C
H
amano
Mak
e
file:
fix shell quoti
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
J
u
nio C Hamano
t
ests: propagate $(TAR
)
down
from the toplevel Makefile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Junio C Ha
m
ano
Merge bra
n
ch 'ph/c
h
eckout'
commit
|
commitdiff
|
tree
2008-07-24
Junio C Hamano
M
erge branch 'maint' into ph/chec
k
out
commit
|
commitdiff
|
tree
2008-07-24
Ju
n
io C Hamano
ignore non-existent
r
efs in dw
i
m_lo
g
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Junio C Hamano
Documentation
:
clari
f
y
d
iff --cc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Junio C Ha
m
ano
builtin-branch
.
c: optimize -
-
merged an
d
--no-m
e
rged
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Junio C Hamano
b
uiltin-branch
.
c:
r
emove u
n
use
d
code
i
n append_
r
ef
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Junio
C Hamano
stash save: fix parameter handli
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
J
unio C Ha
m
an
o
tests: do not rely o
n
external "patch"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Junio C Ham
a
n
o
Revert "make git-stat
u
s use
a
p
ager"
commit
|
commitdiff
|
tree
2008-07-21
Junio
C Hamano
Update my e-mail address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
J
u
nio C Hama
n
o
M
e
rge bran
c
h '
a
p
/tracki
n
f
o'
commit
|
commitdiff
|
tree
2008-07-21
Juni
o
C
Hamano
Merg
e
branch 'jc/rerere-auto-mo
r
e
'
commit
|
commitdiff
|
tree
2008-07-21
Juni
o
C
Haman
o
M
e
rge bra
n
ch 'ns/a
m
-abort'
commit
|
commitdiff
|
tree
2008-07-21
Junio C Ha
m
ano
M
erge branch 'jc/
a
dd-add
r
em
o
ve'
commit
|
commitdiff
|
tree
2008-07-21
Junio C Ham
a
no
"need
s
updat
e
" con
s
idered harm
f
u
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next