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
attr: Allow multiple changes to an attribute on the same line.
2010-04-11
Henrik Grubbström
attr
:
Al
l
o
w multiple c
h
a
nges to an attribute on
the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-11
Henrik Grubbst
r
öm
attr: Fixed debug
output
f
o
r macro exp
a
nsion
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hama
n
o
gi
t
_
attr(): fi
x
funct
i
o
n
si
g
nature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
Junio
C Ham
a
no
r
e
re
r
e forget path: forget recorded resoluti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
J
unio C Ha
m
ano
rerere: re
f
actor rerere l
o
gic to make it independent
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o
C Hamano
r
erere: remove s
i
lly 102
4
-byte line limit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C
Hamano
resolve-undo: tea
c
h "
u
pdat
e
-index
-
-un
r
esolve"
to
u
s
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
J
unio C Hamano
resolve-
u
ndo
:
"checkout -m path
"
u
ses resolve-undo
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Juni
o
C
Hamano
resolve-undo:
allow plumbing to clear t
h
e i
n
formatio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
J
un
i
o C Ham
a
n
o
resolve-undo: basi
c
tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
J
unio C Hamano
r
esolve-undo: re
c
o
r
d res
o
lved con
f
licts in a new inde
x
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C H
a
mano
bui
l
tin-merge
.
c: use standard act
i
ve_cache macr
o
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-23
Junio C H
a
mano
Git 1
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-22
Jun
i
o
C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-22
Da
v
id Reiss
Pr
e
vent gi
t
blame from s
e
gfaulting on a missing author
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Junio C Hamano
Git 1
.
6
.
6
-
rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Junio
C
Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-20
Björn Gu
s
tavsson
r
e
b
ase -i: abort clea
n
ly if the editor fails to
la
u
nch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
S
tephen Boyd
technical-docs: docu
m
e
nt hash
A
PI
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
S
t
ephen Boyd
api-strbuf
.
txt
:
fix
t
ypos
and document launch_ed
i
tor()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
J
uni
o
C Hamano
Git 1
.
6
.
6-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
M
erg
e
b
ra
n
ch 'maint' to sync with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
J
unio C
Ham
a
no
Git 1
.
6
.
5
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio
C Hamano
wor
k
tre
e
: don't
segfault with an abs
o
lute pathsp
e
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Jeff King
ignore u
n
known color configuration
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Joh
a
n
nes Sixt
he
l
p
.
autoc
o
rrect: do not run
a command
i
f
t
he command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-15
Nanako
S
hiraishi
Illustrate "filter" attr
i
bute with
an exa
m
ple
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-12
Björn G
u
stavs
s
on
b
ash:
S
upp
o
rt new 'git fetch' options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Hamano
Update Release No
t
es for 1
.
6
.
6
t
o r
e
move old
bugfixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Hamano
Sync with 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Ju
n
io
C Haman
o
Git 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
F
ix a
r
chive fo
r
mat wi
t
h -- on the command line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Ham
a
no
R
emove post-upload-hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Haman
o
Git 1
.
6
.
6
-
rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Junio C H
a
ma
n
o
Mer
g
e
git://repo
.
or
.
cz/git
-
gui
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge git://git
.
k
ernel
.
org
/
pub/
s
cm/gi
t
k/gitk
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ha
m
ano
Update draft
release
note
s
to 1
.
6
.
6 before -rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Junio
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-09
Junio C
Hamano
Merge branch '
m
m/mai
n
t-mer
g
e-ff-error-message-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o
C Hamano
Merge bran
c
h 'jn
/
maint-pu
l
l-reba
s
e-err
o
r-mess
a
ge
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
M
erg
e
branch 'jk
/
maint-
a
dd-p-dele
t
e-fi
x
' into maint
commit
|
commitdiff
|
tree
2009-12-09
J
unio C H
a
m
a
n
o
Merge git://git
.
bogomips
.
or
g
/
g
i
t-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio C Hamano
Re
v
ert recent "
g
it merge <msg> HEAD
<
commit
>
.
.
.
"
d
epr
e
cation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-08
Jeff King
a
d
d-interactive
:
fix
d
el
e
tion o
f
non-em
p
ty files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-06
SZEDER G
á
bor
bash: u
p
da
t
e
'
gi
t
commi
t
' completion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hamano
Sync w
i
t
h
1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
J
unio C Ham
a
no
Git 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Linus Torvalds
Fix diff
-B/--dirstat
m
iscounting of
n
ewly added contents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Jeff Ki
n
g
rese
t
: improve wor
k
tree safety val
v
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Todd Z
u
llin
g
er
Doc
u
ment
a
tion:
A
vo
i
d use of xmlto --s
t
ringparam
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
René Scha
r
fe
archive:
clarify d
e
scri
p
ti
o
n of
path para
m
ete
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
Jeff King
rerere: don't
segfault on
f
ailure
t
o open rr-
c
a
c
he
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Merge
b
ran
c
h 'maint'
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Prepare for
1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Me
r
ge br
a
n
c
h '
u
k
/
maint-shortlog-encoding'
i
nto
m
ai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C Hamano
Merge branc
h
'fc/maint-f
o
rma
t
-
p
atch-pathspec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Merge branch 'ap/ma
i
nt-merge-stra
t
e
gy-li
s
t
-
fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge branch 'jc
/
ma
i
nt-am-keep' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge b
r
anch 'rs/w
o
rk-around-grep-opt-insa
n
i
t
y' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Merge b
r
a
n
c
h 'rj/m
a
i
nt-cygwin-count-objec
t
s' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C
H
amano
Merge branch 'mm/ma
i
nt-hint-fail
e
d-me
r
g
e
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Merge bran
c
h 'th
/
maint-rem
o
te-
u
pd
a
te-help-st
r
in
g
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Ha
m
ano
M
erg
e
b
r
anch 'rj/
m
a
i
nt-t9700' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
J
unio
C Hamano
Merg
e
bra
n
ch '
l
s/maint-m
a
ilinf
o
-no-in
b
ody'
i
n
to
m
a
i
nt
commit
|
commitdiff
|
tree
2009-12-03
J
un
i
o C
H
aman
o
Mer
g
e
branch '
m
o/maint-crlf-doc' into main
t
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merg
e
branch 't
h
/remot
e
-
u
sage' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
M
erge bran
c
h 'pb/maint-use-custom-perl' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
M
e
r
ge branc
h
'mm/config-
p
athname-tild
e
-
e
xpand'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C
Haman
o
Merge branch 'bc/gre
p
-i-F' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Merge branch 'jk/maint-break-r
e
nam
e
-redu
c
e
-mem
o
r
y'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bra
n
ch
'
r
j
/
maint-simplify-c
y
g
w
in-makefile
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
i
o C
H
am
a
no
Merge branch
'rg/d
o
c-workflow
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge branch 'np/maint-
s
ideba
n
d-favor
-
status' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
akub
Nare
b
ski
gitweb: Descri
b
e (possible
)
gitweb
.
j
s
minifica
t
i
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Documentation
:
x
mlt
o
0
.
0
.
18 does n
o
t
k
n
ow -
-
stringp
a
ram
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herland
Fix cra
s
her on enco
u
ntering SHA1-l
i
ke n
o
n-
n
ote in
notes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Brandon Casey
t9001: u
s
e older
G
e
topt::Lo
n
g boo
l
ean p
r
efix '-
-
no
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
B
r
an
d
o
n
C
asey
t4201: use ISO8859-1 rather than ISO-8859-
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jan Krüger
pull: clarify advice for the unconfig
u
r
e
d e
r
ro
r
case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Merge in 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C Hamano
G
i
t 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Unc
o
nditionally
set man
.
base
.
url
.
for
.
relative
.
links
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Juni
o
C Hamano
G
it 1
.
6
.
6-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Ho
r
st
H
.
von Brand
git-
p
u
ll
.
sh:
F
ix c
a
ll to gi
t
-merge for
n
ew comma
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C H
a
m
ano
Mer
g
e
branch
'
mai
n
t'
commit
|
commitdiff
|
tree
2009-12-02
J
u
nio C
H
amano
Prepare for
1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
J
u
n
i
o
C
Hamano
me
r
ge
:
do no
t
add standard me
s
s
a
ge wh
e
n me
s
sag
e
is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
J
unio C
Hamano
Do not misidentify "git merge
foo HEAD"
as an old-style
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Juni
o
C Hamano
Update draft release notes to 1
.
6
.
6 before -rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
J
unio C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2009-12-01
Junio C
Hamano
Me
r
ge bra
n
ch 'jc/deprecate-old-s
y
ntax-
f
ro
m
-merge'
commit
|
commitdiff
|
tree
2009-12-01
J
uni
o
C
H
amano
g
i
t-merge: a dep
r
e
cation notice
o
f the anci
e
n
t
command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Juni
o
C Hama
n
o
Merge
b
ranc
h
'bw/remote-get-ref-st
a
t
e
s-
f
ix
'
commit
|
commitdiff
|
tree
2009-12-01
Bert
W
e
sarg
ge
t
_ref_sta
t
es:
str
d
u
p entries and free ut
i
l
i
n st
a
le
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Davi
d
Aguilar
help: Do not unn
e
ce
s
s
a
r
i
ly
lo
o
k for a rep
o
s
itory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
M
ichael J
Gruber
Docu
m
entatio
n
:
F
ix a fe
w
i
.
e
.
/e
.
g
.
m
i
x-ups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
J
u
n
io C Ham
a
no
Merge branch 'jn
/
gitweb
-
blame'
commit
|
commitdiff
|
tree
2009-12-01
Jakub Narebsk
i
gitweb: Add link to other bl
a
me impleme
n
tati
o
n i
n
bl
a
m
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
J
a
kub Nar
e
bski
gitweb:
M
ake linking to
a
ctions
r
equiring JavaS
c
ript
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
J
unio C
Hamano
Merge branch 'fc/maint-format-patch-paths
p
ec-dashes'
commit
|
commitdiff
|
tree
next