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 Haman
o
Fix
b
it assignment f
o
r CE_CONF
L
I
C
T
E
D
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Ham
a
no
"
r
eset --merge": fix unmerged case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
Junio C Ha
m
ano
Gi
t
1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
Junio C Haman
o
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-20
Junio C Haman
o
Git 1
.
6
.
6-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio
C Hamano
Merge bran
c
h 'maint'
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
J
unio C Hamano
M
erge branch 'maint' to sync wit
h
1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Juni
o
C Hama
n
o
Git 1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
w
o
rktree: d
o
n't
s
egfault wi
t
h an absolute pathspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Hamano
Update Release N
o
tes for
1
.
6
.
6 t
o
r
emov
e
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
Junio C
H
a
m
ano
G
i
t
1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Fix a
r
chive
f
ormat
with -- on the comm
a
nd line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
J
u
nio C Ham
a
no
Remove
p
ost-upload-hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio
C
H
amano
Git
1
.
6
.
6-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
J
u
n
i
o C Hamano
Mer
g
e
g
it://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2009-12-09
J
unio C Hamano
Merge g
i
t://git
.
ke
r
nel
.
org/pub
/
scm/gitk/gitk
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
i
o
C
Hamano
U
p
date draft
release notes
t
o 1
.
6
.
6
b
efore -rc
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
M
e
rge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-09
Junio C H
a
mano
Merg
e
br
a
nch 'mm/m
a
int-merge-ff-err
o
r
-
message-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge branc
h
'
j
n
/main
t
-pull-re
b
ase
-
error-message'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge bran
c
h 'jk/maint-a
d
d-p-del
e
t
e
-fix' into maint
commit
|
commitdiff
|
tree
2009-12-09
J
unio C Hama
n
o
Merg
e
git://g
i
t
.
b
ogomips
.
org/
g
i
t-
s
vn
commit
|
commitdiff
|
tree
2009-12-08
Jun
i
o
C Hamano
Revert
r
e
cent "
g
i
t
merge
<msg> HEAD <commit>
.
.
.
" deprecation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hamano
Sync wit
h
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Juni
o
C Hamano
Git
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C
H
a
man
o
M
e
rge branch '
m
ain
t
'
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Pre
p
a
r
e for 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
m
ano
Merge
b
r
anch 'uk/maint-shortlog-encoding' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Mer
g
e branc
h
'
f
c/maint-format-patch-pathspec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merg
e
branch 'ap/maint-merge-stra
t
e
g
y-l
i
st-fix' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge
branch 'jc/maint-am-ke
e
p'
i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
M
e
rge b
r
anch 'rs/work-around-grep-opt-insanity'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C
Hamano
M
erge branch 'r
j
/maint-cygwin-count-objects' into maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o C Hama
n
o
Merge branch
'
m
m
/maint-hint-f
a
iled-me
r
ge' in
t
o m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge b
r
a
n
ch 'th/maint-remo
t
e-update-help-string' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C
Hamano
Merge
branch 'rj/maint-t
9
7
00' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Me
r
ge bran
c
h 'ls/ma
i
nt-mai
l
info-no-inbo
d
y' into main
t
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C
Hamano
Merge
branch 'mo/maint-
c
rlf-doc' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
M
er
g
e branch '
t
h/remote
-
usage' into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge branch 'pb/mai
n
t-use-cu
s
tom-pe
r
l' into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Merg
e
branch 'mm
/
c
onfi
g
-pathname-til
d
e-expand'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Me
r
g
e branch 'bc/grep-i-F' int
o
main
t
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C
H
amano
Merge
b
ranch
'jk/maint-brea
k
-rename-
r
educe
-
memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Merge branch 'rj/maint-simplify-cygwin-m
a
ke
f
i
le' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
a
n
o
Merge branch 'rg/
d
o
c-workflow' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge
br
a
n
ch 'np/ma
i
n
t-side
b
and-favor-st
a
tus'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
ma
n
o
D
o
cumentation: xmlto 0
.
0
.
18 does n
o
t know --stringp
a
ra
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
aman
o
Mer
g
e
in 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
G
it 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
amano
U
ncondi
t
ionall
y
s
e
t man
.
base
.
ur
l
.
for
.
relative
.
link
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Mer
g
e branch
'
m
a
i
n
t'
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Docu
m
enta
t
i
o
n/Makefile: a
l
low man
.
base
.
ur
l
.
for
.
r
ela
t
ive
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Junio
C
Ha
m
ano
Git
1
.
6
.
6-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Jun
i
o
C Hamano
M
e
rge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Prepare for 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
io C Hamano
m
erge: do n
o
t add standard m
e
ssage when message is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
J
unio C Hamano
Do
not misidentify "g
i
t m
e
rge foo HEAD" as
a
n old-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
io C Hamano
Update
d
r
aft r
e
lease notes to 1
.
6
.
6 befor
e
-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
J
unio C
H
am
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Merge b
r
a
n
c
h
'j
c
/deprecate-old-synt
a
x-fr
o
m-merge'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
git-merge: a deprec
a
tio
n
not
i
ce of the ancient comm
a
nd
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
Hamano
Merge branch 'bw/remote-get
-
r
e
f-states-fix'
commit
|
commitdiff
|
tree
2009-12-01
J
unio C Hamano
Merge branch
'jn/gitweb-blame
'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C Hamano
Merge br
a
nch 'fc/maint-
f
ormat-patch-pathspec-
d
ash
e
s'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio C Hamano
Merge
branch 'mm/maint-me
r
g
e
-f
f
-e
r
r
or-mess
a
ge-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C H
a
mano
Mer
g
e
b
r
anch 'ap/maint-merge-strategy-list-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hama
n
o
M
erge branch 'jc/
p
ret
t
y
-lf
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Me
r
ge
branch 'cc/bisect-doc'
commit
|
commitdiff
|
tree
2009-11-30
J
unio C Ham
a
n
o
Merge bra
n
c
h
'em/commit-
c
laim'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merg
e
branch '
j
c/m
a
ilinfo-remove-brackets'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'fc
/
send-email-en
v
elope'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o C Hama
n
o
Merge bran
c
h 'uk/ma
i
nt-sho
r
t
l
og-e
n
coding
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C H
a
ma
n
o
Merge branch 'ns/se
n
d
-email
-
no-ch
a
in-reply-to'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
Ham
a
no
M
erge br
a
nch 'jc/maint-am-keep'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
H
amano
Merge
branch 'bw/diff
-
col
o
r-hu
n
k-hea
d
er'
commit
|
commitdiff
|
tree
2009-11-28
Junio C
H
amano
U
pdate draft
r
elease
n
ote
s
to 1
.
6
.
6 before merging
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
Junio C Hamano
emit_line
(
)
: don
'
t emit
an
e
mpty <
S
E
T
>
<
RESET>
fol
l
o
w
ed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Ham
a
no
R
e
move dead co
d
e
f
r
om "git am
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-11-27
Junio C Ha
m
a
no
builtin
-
apply
.
c: pay a
t
te
n
t
ion
t
o
-p<
n
>
whe
n
d
etermining
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
Junio C Ham
a
no
Merge branch
'rs/
w
ork-aro
u
nd-
g
rep-opt
-
insanity'
commit
|
commitdiff
|
tree
2009-11-24
Junio C
H
amano
Mer
g
e
b
r
a
nch '
r
j/maint-cygwin-count-obj
e
c
t
s
'
commit
|
commitdiff
|
tree
2009-11-24
Jun
i
o C Hamano
Merg
e
br
a
n
ch 'rs
/
color-escape-has-zero-width'
commit
|
commitdiff
|
tree
2009-11-24
J
u
n
i
o C Hamano
Mer
g
e
branch
'bg/apply
-
doc'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Ham
a
no
Merg
e
branch '
m
m/maint-hint-failed-merge
'
commit
|
commitdiff
|
tree
2009-11-24
J
u
ni
o
C H
a
ma
n
o
Merge branch
'
jc/log-
s
tdi
n
'
commit
|
commitdiff
|
tree
2009-11-24
J
unio C
Hamano
Merge
branch 'mr/gitweb-s
n
apshot'
commit
|
commitdiff
|
tree
2009-11-24
J
u
nio C H
a
mano
Merge b
r
anch 'cc/r
e
p
la
c
e
'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Haman
o
Merg
e
branch
'maint'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hama
n
o
Pr
o
tect scripted Porce
l
ai
n
s from GREP_OPTION
S
insanity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Juni
o
C Hamano
Add t
r
ivial tests f
o
r --stdin optio
n
t
o log f
a
mily
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Junio C
Ha
m
an
o
Mer
g
e branch 'bg/
f
etch-mul
t
i'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Git v1
.
6
.
6-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Juni
o
C Hamano
M
e
rge b
r
anch 'main
t
'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Me
r
ge
g
it://git
.
bogomips
.
org/git-s
v
n
commit
|
commitdiff
|
tree
2009-11-23
Jun
i
o C H
a
mano
M
e
r
ge branch '
t
h/maint-re
m
ote-update-he
l
p
-strin
g
'
commit
|
commitdiff
|
tree
2009-11-23
Junio C
Ha
m
ano
Merge branch '
j
n/fa
s
ter-co
m
pletion
-
startup
'
commit
|
commitdiff
|
tree
2009-11-23
J
uni
o
C Haman
o
Merge branch 'rj
/
maint-t9700'
commit
|
commitdiff
|
tree
next