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
Fix bit assignment for CE_CONFLICTED
2010-01-04
Junio C H
a
mano
F
ix bit assignment
f
o
r CE_CONFLICTED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Hamano
"r
e
set --mer
g
e": fix un
m
erged case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-03
Stephan
B
e
yer
r
e
set: use "
u
n
pa
c
k_trees()" dir
e
ctly instead of
"
git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Christi
a
n Couder
res
e
t: add a few
tests for "g
i
t res
e
t
--m
e
rg
e
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Chri
s
tian Cou
d
er
D
o
cumentation
:
r
e
set
:
a
d
d s
o
m
e tab
l
es to d
e
scri
b
e the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Christian
C
ouder
reset
:
i
mprove
m
i
xe
d
r
e
set error me
s
s
a
ge
when in a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
Junio
C Hamano
Gi
t
1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
Junio C
H
amano
Merge
b
ranc
h
'maint'
commit
|
commitdiff
|
tree
2009-12-22
David Reiss
Prevent git b
l
ame from segfaul
t
ing on a
missin
g
author
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio C Hamano
Git 1
.
6
.
6-r
c
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio
C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-20
B
jö
r
n Gustavsson
rebase -
i
: abort c
l
eanl
y
if
t
h
e
e
d
itor fails to launch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
Stephen Boy
d
t
ech
n
i
c
al-docs
:
doc
u
ment
h
ash API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
S
t
eph
e
n Boyd
api-strbuf
.
txt: f
i
x typo
s
an
d
d
o
c
um
e
nt
launch_edito
r
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Git 1
.
6
.
6
-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Haman
o
Merge
br
a
nc
h
'maint' t
o
sync with
1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Git 1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
worktree: don't segfault with an absolute pathspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Jeff King
ignore
unknown color conf
i
gu
r
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Johannes
Sixt
hel
p
.
a
utocor
r
e
c
t: do not run a
c
o
m
m
a
nd
i
f
the command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-15
Nanak
o
Shi
r
a
i
shi
Illustrat
e
"filte
r
" attrib
u
te with a
n
example
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
Björ
n
Gustavsson
bas
h
: Suppo
r
t new 'gi
t
fetch' options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Juni
o
C H
a
mano
Update Release Notes for 1
.
6
.
6 to
r
emove old bugfix
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
J
u
nio C Hamano
S
y
nc
wit
h
1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Ju
n
i
o 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
H
amano
F
i
x archive form
a
t with -
-
on the comma
n
d
line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio
C Hama
n
o
Remove p
o
s
t-upload-hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio
C Hamano
Git 1
.
6
.
6-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
J
unio C Hamano
Mer
g
e git://re
p
o
.
or
.
cz/gi
t
-gui
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge git
:
//git
.
k
e
rnel
.
org/
p
ub/scm
/
gi
t
k/gi
t
k
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ha
m
ano
U
p
date
d
raft relea
s
e notes to 1
.
6
.
6
before -
r
c2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Haman
o
Merge b
r
an
c
h 'maint'
commit
|
commitdiff
|
tree
2009-12-09
J
u
ni
o
C Ham
a
no
Merg
e
b
r
a
n
c
h
'
mm/maint-merge-ff-error-me
s
sage-
f
ix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hama
n
o
Me
r
ge branch
'jn/ma
i
nt-
p
ull-rebase-error-m
e
ssage' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Mer
g
e branch
'jk/maint-add-p-
d
elete-fix' into
m
ai
n
t
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ham
a
no
M
e
rge git://git
.
bogomips
.
org/git
-
svn
commit
|
commitdiff
|
tree
2009-12-08
Juni
o
C Hamano
Revert recent
"git merge <ms
g
> H
E
AD <c
o
mmit>
.
.
.
" depr
e
cation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-08
Jeff King
add-interactive: fi
x
deletion of non-empty files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-06
SZ
E
DER Gábor
bas
h
:
u
pdat
e
'git comm
i
t' completion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
J
unio C
Hamano
Sync with 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
J
u
nio
C Hamano
Git 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Linus
Torvalds
F
ix
d
i
ff
-
B
/--dirs
t
at
m
iscounting o
f
newly added
c
ontents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Jeff King
reset: improve workt
r
ee safet
y
val
v
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Tod
d
Zullinge
r
Documentati
o
n
:
Avoid use of x
m
lto --stringparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
Ren
é
Scharfe
archive: clar
i
fy description of pat
h
pa
r
ameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
Jeff Kin
g
rere
r
e:
don't segfault on fail
u
re t
o
ope
n
rr-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Me
r
ge b
r
a
n
ch
'
main
t
'
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
P
r
epare for
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
rge branch 'uk/mai
n
t-shor
t
lo
g
-encoding' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch
'fc/m
a
int-format
-
patch-pathspec-da
s
hes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C
H
a
m
a
n
o
M
er
g
e branch 'ap/m
a
i
n
t-merge-strate
g
y
-
list-
f
ix' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Ham
a
no
Merge
branch 'jc/maint-am-keep
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Merge bran
c
h
'
r
s/work-around-g
r
ep-opt-insanit
y
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C Hamano
Merge
branch 'rj/maint-cygwin
-
cou
n
t
-objects
'
into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C H
a
mano
M
e
rge branch 'm
m
/maint-hin
t
-failed-merge' into
ma
i
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Ha
m
a
n
o
Merge branch
'
th/main
t
-remote-u
p
dat
e
-help
-
string' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'rj/
m
aint-t9700' into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C
Hamano
Merge bra
n
c
h
'
l
s
/ma
i
nt-mail
i
nf
o
-no-inbody' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C
Hamano
Merge bran
c
h 'mo
/
m
a
int-crlf-do
c
' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Haman
o
Mer
g
e branch 'th/r
e
mo
t
e-usage' into
maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io
C Hamano
Me
r
ge bra
n
ch 'pb/m
a
i
nt-us
e
-custom-perl' int
o
m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
M
e
r
ge b
r
anch 'mm/confi
g
-p
a
thname-tilde-exp
a
nd
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge branch '
b
c/grep-i-F' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hama
n
o
Merge b
r
anch '
j
k/m
a
int-break-rename-
r
e
d
uce-m
e
mory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C
Hamano
Merge branch
'rj/maint-simplify-cy
g
win-mak
e
fi
l
e' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merge branch 'rg/doc-workflow' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merg
e
bra
n
ch 'np/maint-si
d
eband-favor
-
status' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jakub Narebski
g
i
t
web: D
e
scribe (p
o
ssible) gitweb
.
js minification
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o
C Hamano
Document
a
tion:
x
mlto 0
.
0
.
18 does n
o
t know --
s
t
r
i
ngpar
a
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
o
h
a
n
H
erlan
d
Fix crasher on encount
e
ring SHA1-like non-
n
ote in
notes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
B
randon Casey
t9001:
use old
e
r Get
o
pt::Long boole
a
n
prefix '--no
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Brandon
C
a
s
e
y
t4201: use ISO8859-1 r
a
t
her tha
n
ISO-885
9
-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jan Krüger
pul
l
: cla
r
if
y
advice
f
or the un
c
onfigured
e
rr
o
r case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge in 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o 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
Hamano
Unc
o
nditiona
l
ly set man
.
base
.
url
.
for
.
relative
.
links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Ham
a
no
Merge br
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Documentation/Mak
e
f
ile: allow
m
an
.
bas
e
.
url
.
f
or
.
relative
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
J
unio C Hamano
G
it 1
.
6
.
6
-
rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
H
o
rst
H
.
von Brand
git-p
u
ll
.
sh
:
Fix cal
l
to git-me
r
g
e
for new com
m
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
J
u
n
i
o C Haman
o
Merge bran
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hama
n
o
Pr
e
par
e
fo
r
1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C H
a
mano
merge: do n
o
t
add standard message whe
n
m
e
ss
a
ge is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hama
n
o
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
J
un
i
o C Hamano
U
p
date dr
a
ft release notes to 1
.
6
.
6 before -
r
c
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
io C
Hamano
M
erge branch
'
m
a
int'
commit
|
commitdiff
|
tree
2009-12-01
J
u
ni
o
C Hamano
Merge branch 'jc/deprec
a
t
e-old-syn
t
ax-
f
rom-merge'
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
io C Hamano
gi
t
-merge: a d
e
precation notice of th
e
ancient command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C
H
a
mano
Mer
g
e branch 'bw/remote-
g
et-ref-states
-
fix'
commit
|
commitdiff
|
tree
2009-12-01
B
e
rt Wesar
g
get_ref_s
t
ates
:
strdup en
t
ries and f
r
ee util
i
n
stale
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
h
elp:
Do not unnec
e
ssarily look for a repository
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Michae
l
J Gru
b
er
Do
c
umentation: Fix a few
i
.
e
.
/e
.
g
.
mix
-
ups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
H
a
m
ano
Merg
e
bra
n
ch 'jn/gitweb
-
blame'
commit
|
commitdiff
|
tree
2009-12-01
Jakub Na
r
ebs
k
i
gitweb:
A
dd li
n
k to oth
e
r blame
i
m
plementati
o
n
in bl
a
me
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Jakub Na
r
ebski
gitweb: Make linking t
o
a
c
tions
r
equiring JavaScript
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
J
unio C Haman
o
Merge branch 'fc/maint-forma
t
-patch-pathspec-dashes'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o C Hamano
Merge
b
ra
n
ch 'mm/main
t
-merge-ff-error-message-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
Hamano
Mer
g
e
b
r
a
nch 'ap/mai
n
t
-
merge-strategy-list-fix
'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o C Hamano
M
e
r
ge b
r
anch 'j
c
/
p
retty-lf'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
Hamano
Merge branc
h
'cc/bisect-doc'
commit
|
commitdiff
|
tree
next