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 'jc/maint-log-grep'
2008-08-24
Junio C Hamano
M
e
rge branc
h
'ma
i
nt
'
to syn
c
with 1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
Junio
C
Hamano
GIT 1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Juni
o
C Hamano
Merge branch 'a
g
/maint-combine
-
d
i
ff-fix' into ma
i
n
t
commit
|
commitdiff
|
tree
2008-08-24
Junio
C
Hama
n
o
Merge branch 'mv
/
maint-merge-fix'
into main
t
commit
|
commitdiff
|
tree
2008-08-24
Ma
r
k Leve
d
ahl
git-submodule - Us
e
"get_default_remot
e
" fr
o
m
git-parse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
J
onathan N
i
eder
D
o
cumentation: clar
i
fy pager configurat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jonathan
N
ied
e
r
Docu
m
entati
o
n: c
l
ari
f
y pager
.
<c
m
d
>
configuration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
S
im
o
n Haus
m
ann
C
lean up
t
he git-p
4
documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Alexa
n
der Gavrilov
Respect core
.
a
u
t
ocrlf in co
m
bin
e
d d
i
ff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Mik
l
o
s
Vajna
Ma
k
efile
:
enable SN
P
RINTF_RETURN
S
_BOGUS for HP-U
X
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
t7606: fix c
u
s
t
om mer
g
e test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2008-08-24
Junio C H
a
mano
merge
:
fix
n
umerus bugs around "trivial me
r
g
e
" area
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
unpack_trees(): protect the
h
and
c
rafted i
n
-core index
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
T
o
r
A
rvid
Lund
git-p
4
:
F
ix
o
n
e-liner in p4_write_pipe
funct
i
on
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git-submodule: replace duplicated
c
o
d
e
with a module_
l
ist
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Nicolas Pitr
e
d
iscard revindex data when pack list changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Dan Hens
g
en
git-merge do
c
umentation: mo
r
e details
a
bout resolving
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Al
e
x R
i
esen
E
x
tend "ch
e
ckout --t
r
ac
k
" DWIM
t
o support more case
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Jonathan
d
el Strother
Revert "C
o
nvert outpu
t
messages in merge
-
r
ecursive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
E
ric
Rai
b
le
Comp
l
et
i
on
:
ad
d
m
i
s
s
ing '=' for '
d
iff --diff-filt
e
r'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Junio C Hamano
t
e
m
plates/Makefile: ins
t
all is unnecessary, just u
s
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Brandon
C
a
sey
remote
.
c
:
add a
function for de
l
eting a refspec array
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Johannes Sixt
filt
e
r-branch: Grok s
p
ecial cha
r
acters in tag names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Johannes Schi
n
delin
test-lib: do not remove trash_directo
r
y if called wit
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Paolo Bo
n
zini
pr
o
v
i
de
m
ore er
r
ors f
o
r the "merge in
t
o
empty he
a
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Shaw
n
O
.
Pe
a
rce
Ma
k
e reflog qu
e
ry '@{12
1
9188291
}
'
act a
s
'@{200
8
.
8
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Nei
l
Rob
e
rts
config
.
mak
.
in: Pas
s
on LDF
L
A
GS from config
u
re
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Mark Lev
e
dahl
git-submodule
.
sh - Remov
e
t
rai
l
ing /
f
r
o
m
URL if found
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Mikl
o
s Vajna
Fix 'g
i
t
help help'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C H
a
mano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2008-08-21
Brando
n
Case
y
compat/
s
nprintf
.
c: hand
l
e snprintf's that always ret
u
rn
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Joha
n
Herland
Teach "git
diff -p"
H
T
ML funcna
m
e patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Kiri
l
l
Smelko
v
Teach "git diff
-p" Python funcnam
e
pa
t
terns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Er
i
c W
o
ng
git-svn: fix dcommi
t
t
o ur
l
s with embedde
d
u
sern
a
me
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Junio C H
a
mano
Merge branc
h
'm
l
/submodule-foreach'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C
Hamano
Merge branch 'pm
/
log
-
exit-c
o
de'
commit
|
commitdiff
|
tree
2008-08-21
Junio C H
a
mano
M
erge branch
'sb/c
o
mmit-tree-minileak'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Haman
o
Mer
g
e bran
c
h 'pb/ref
l
og-d
w
im'
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C H
a
mano
Me
r
g
e branch 'jc/add-stop-at-
s
ymlink
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
H
a
m
ano
Merge branch
'
kh/diff-tree
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Mer
g
e branc
h
'mg/c
o
u
nt-objects'
commit
|
commitdiff
|
tree
2008-08-21
J
u
n
i
o C Hamano
Merge branch
'
mz/pus
h
-ve
r
bose'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
io C H
a
m
a
n
o
M
erge branch 'jc/index-extende
d
-flags
'
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C Hama
n
o
M
erge
branch 'cc/merge-base-many'
commit
|
commitdiff
|
tree
2008-08-21
Junio C H
a
mano
Mer
g
e br
a
nch 'jc/test
-
deeper'
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o
C Hamano
Merge bra
n
ch 'js/parallel-test'
commit
|
commitdiff
|
tree
2008-08-21
M
ark
L
e
vedahl
git
-
submodul
e
.
sh - Remove tr
a
iling
/ from URL
if found
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
J
unio
C Ham
a
no
Fix "git-merg
e
-s bogo"
help text
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
B
r
andon
Casey
rev
i
sion
.
h: make show_early_o
u
tput
an extern w
h
ich
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Upd
a
te draft release
notes for 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C
Hamano
Merge branch
'ma
i
nt'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
U
pdate dra
f
t releas
e
notes for 1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
T
armig
a
n Casebolt
Add hints to
rever
t
d
o
cumentation
a
b
out other
way
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Johannes
S
i
x
t
Inst
a
ll templates w
i
th the us
e
r and group of th
e
inst
a
lling
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio
C
H
amano
"
git-m
e
rge"
:
allow fast
-
for
w
arding in a stat-dirty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
io
C Haman
o
completion: find out s
u
p
p
or
t
ed merge strategies co
r
rectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jeff King
decora
t
e: allow c
o
nst obj
e
c
t
s
to
be decorated
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jun
i
o
C
Ha
m
ano
fo
r
-each-r
e
f:
c
ope
w
ith tag
s
with
incom
p
l
e
te lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
u
nio C Hamano
diff --check:
do not get confus
e
d by new
blank lines
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
u
n
io C Hamano
Build-in "gi
t
-
shell"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
M
erge br
a
nch 'bd/diff-strbuf'
commit
|
commitdiff
|
tree
2008-08-20
Junio
C
Hama
n
o
Merge br
a
nc
h
'
dp/hash-l
i
te
r
al
l
y'
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
io C Hamano
Merge
branch 'js/c
h
e
c
k
out-
d
wim-l
o
cal
'
commit
|
commitdiff
|
tree
2008-08-20
Juni
o
C Ham
a
no
Merge branch 'ph/
e
nable-thread
e
d'
commit
|
commitdiff
|
tree
2008-08-20
J
u
n
io C Hamano
Merge branch
'
j
k/pag
e
r-swap'
commit
|
commitdiff
|
tree
2008-08-20
J
unio C Hama
n
o
Merge branc
h
'rs
/
imap'
commit
|
commitdiff
|
tree
2008-08-20
Junio
C
H
amano
Mer
g
e
bran
c
h 'js/mingw-s
t
at'
commit
|
commitdiff
|
tree
2008-08-20
Jim Meyering
remote
.
c:
re
m
o
ve useless if-befor
e
-free test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jeff King
mai
l
i
n
fo:
a
void
v
iolating
st
r
buf assertion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
i
m Me
y
er
i
ng
r
eword --full-index descri
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jim
M
ey
e
ring
S
ubmi
t
tingPatches:
fix a
typ
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
i
m Me
y
erin
g
add boolean diff
.
s
u
ppre
s
s-blank-empty
c
onfi
g
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
im Meyering
git
f
ormat-pat
c
h: av
o
id unde
r
run w
h
en
format
.
he
a
ders
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
io C Hamano
shell
:
do
n
o
t play dup
l
icated definiti
o
n games
to sh
r
ink
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
J
u
n
i
o
C
Hamano
Merge b
r
anch
'
maint'
commit
|
commitdiff
|
tree
2008-08-19
Bran
d
on Casey
t1002-read-tree
-
m-u-2way
.
s
h
:
u
s
e 'git diff -U0'
r
ather
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Mar
c
us Gr
i
ep
Update t/
.
gitignore to i
g
nore
all trash direct
o
ries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Joh
a
nnes Sixt
Rev
e
rt
"Wi
n
d
o
ws: Use
a
c
us
t
omi
z
ed struct stat that
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
J
u
nio
C Hamano
compat: introduce o
n
_
d
isk
_
bytes()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
R
o
bert Schiel
e
adapt git-cvsserver manpage to
dash-free synt
a
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Don Zickus
mailinfo: re-fix MIME
mult
i
part boundar
y
parsing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-18
Junio C Haman
o
revis
i
on --si
m
plify-merge
s
: make it a no-o
p
wi
t
hout
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-18
Junio C H
a
m
ano
revisi
o
n --simp
l
i
f
y-me
r
g
es: do not leave commits unprocessed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-18
St
e
phen R
.
van den
.
.
.
git-daemon:
rewrite k
i
ndergarden, new option --m
a
x
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-18
Ste
p
hen R
.
van
d
en
.
.
.
git-d
a
emon:
Simplify dead-c
h
ildre
n
reaping logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-18
Stephen R
.
van de
n
.
.
.
git-daemon: use LOG_
P
ID, simplify logging code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-18
Stephen R
.
van
den
.
.
.
git-d
a
emon: cal
l
logerror() in
s
tea
d
of er
r
or()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Mark Leve
d
ahl
g
i
t-submod
u
le - A
d
d
'foreach' s
u
bc
o
mmand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Stephan Beyer
Fix
c
ommit_t
r
ee() buffer leak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
P
eter Va
l
demar M
ø
rch
Teach git
l
og --exi
t
-code to return an appropriate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Pet
e
r Va
l
demar Mørch
Teach git lo
g
--check t
o
retur
n
an appro
p
riate exit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Pieter de Bie
builtin-
r
eflog: Allo
w
reflog ex
p
ire t
o
name
partial ref
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Ha
m
ano
Start 1
.
6
.
1
cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Ha
m
ano
S
t
art
1
.
6
.
0
.
X
maintenance series
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Haman
o
GIT 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Ju
n
io C
Hamano
Merge
git-gui
0
.
11
.
0
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hama
n
o
Merge branch '
a
k/p4
'
commit
|
commitdiff
|
tree
2008-08-17
M
arcu
s
G
riep
c
o
unt-ob
j
e
c
t
s
: Add to
t
al pack
s
i
ze to verb
o
se output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hama
n
o
tests
:
use $TE
S
T_DIRECTORY to r
e
fer to the
t
/ director
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next