repo.or.cz
/
git
/
git-svn.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 Ha
m
ano
Fix bit
a
ssignment f
o
r C
E
_CONFLIC
T
ED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Ha
m
an
o
"re
s
e
t
--merg
e
"
:
fix
u
nmerged c
a
se
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
Junio C Ham
a
no
Git 1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
J
un
i
o C Hamano
M
er
g
e bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2009-12-20
J
u
nio C Hamano
Gi
t
1
.
6
.
6-rc
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio
C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-16
Junio C
H
amano
Git 1
.
6
.
6
-rc
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
J
unio
C
H
a
mano
M
e
rge branch 'm
a
int' to sync with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
G
i
t 1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Ju
n
i
o
C
H
amano
worktree
:
do
n
'
t
segfa
u
lt wit
h
an absolute
paths
p
e
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio
C Hama
n
o
U
p
date Rel
e
as
e
Notes for 1
.
6
.
6 to remov
e
old
bugfixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
J
un
i
o C
H
am
a
n
o
Sync with 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio
C
Hamano
Git
1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
J
u
nio C Haman
o
Fix a
r
chi
v
e
f
o
rmat with -- o
n
the co
m
man
d
li
n
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Remove p
o
st-up
l
oad-hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Jun
i
o C Ham
a
no
Git 1
.
6
.
6-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge git://repo
.
or
.
cz/g
i
t-gui
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C Hamano
Merge git://git
.
kern
e
l
.
o
r
g/p
u
b/s
c
m/gitk/gitk
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Ham
a
no
Update
draft release notes to 1
.
6
.
6 before -r
c
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
J
u
n
i
o C H
a
mano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge branch
'
mm/mai
n
t-me
r
g
e-ff-error-message-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C
H
amano
M
erge bra
n
ch 'jn/maint-
p
ull-re
b
ase-error-message' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C H
a
mano
Merge branch
'jk/maint-add-
p
-delete-
f
i
x
'
into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge gi
t
://
g
it
.
bog
o
mi
p
s
.
org/g
i
t-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio C
H
amano
Revert recent "git m
e
rge <
m
sg> HEAD <commit
>
.
.
.
"
depre
c
at
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Jun
i
o C Hama
n
o
Sync with 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Juni
o
C
H
amano
G
it 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge b
r
anch 'main
t
'
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Prepa
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
mano
Merge branch 'uk/mai
n
t-shortlog-encoding' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Mer
g
e br
a
nch 'fc/ma
i
nt-format-patch
-
paths
p
ec
-
das
h
es
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Ham
a
no
Merge
branch 'ap/maint-merge-strateg
y
-list-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Merg
e
b
r
anch
'jc/main
t
-
a
m
-keep' into main
t
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
M
e
rge br
a
nch 'rs
/
work-arou
n
d-grep-opt-insani
t
y' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio
C Hamano
Merge branch 'rj/
m
ai
n
t-cygwin-count-objects
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Me
r
ge branch 'mm/m
a
i
nt-hint-failed-
m
erge' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bran
c
h 'th/maint-remot
e
-update-he
l
p
-
string' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge
branch
'rj/maint-t970
0
' into maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io
C
H
a
mano
Mer
g
e branch
'
ls/
m
aint-mailin
f
o
-
no-inbody' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merg
e
bra
n
c
h
'
m
o/mai
n
t
-
c
rlf-
d
o
c' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merge branch
'
th/rem
o
te-usage' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Ham
a
no
Merg
e
b
ranch 'pb/
m
aint-u
s
e-
c
u
stom-
p
erl'
i
n
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hama
n
o
Merge
branch 'mm/config-pathname
-
t
ilde-expand' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
un
i
o C Hamano
M
e
rge
branch
'bc/g
r
ep-i-F'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
rge branch 'jk/maint-brea
k
-rename
-
r
e
duce-memo
r
y
'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge branch
'
rj/main
t
-simplif
y
-
c
y
gwin-makefile' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merge branch
'
rg/doc-workflow'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
rge
branch 'np/maint-side
b
an
d
-favor-st
a
t
us' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C
H
amano
Do
c
umentat
i
on: xmlto 0
.
0
.
18 does not
k
now --stringpar
a
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Mer
g
e
i
n
1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Git 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Un
c
ondit
i
ona
l
ly
s
et man
.
ba
s
e
.
url
.
for
.
relat
i
ve
.
lin
k
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
ni
o
C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Ham
a
n
o
Docume
n
tation/Makefile
:
a
l
l
o
w man
.
ba
s
e
.
url
.
fo
r
.
rel
a
ti
v
e
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Junio
C Ha
m
ano
Git 1
.
6
.
6-r
c
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C
H
amano
M
erge branc
h
'maint'
commit
|
commitdiff
|
tree
2009-12-02
J
u
n
io C Hamano
Prepare f
o
r 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
J
unio C Hamano
merge: d
o
not
a
d
d standard mes
s
age whe
n
mes
s
a
g
e is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C
Hamano
Do not m
i
sidentify "git me
r
g
e
foo HEAD" as an
o
ld-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
J
unio C
Hamano
Upd
a
te draft r
e
lease notes to 1
.
6
.
6 before -rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Mer
g
e b
r
anch 'maint'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Merge branch 'jc/deprecate-old-syntax-from-merge'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Ha
m
ano
git-merge: a
deprecation not
i
ce of the an
c
i
e
nt
command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
J
u
nio C Hamano
Me
r
ge branch 'bw/re
m
ote-ge
t
-ref-stat
e
s-fix
'
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
Hamano
Merge branch 'jn/g
i
tweb
-
blam
e
'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C H
a
mano
Merge branch
'fc/m
a
i
n
t-format-patch-pathspec-d
a
she
s
'
commit
|
commitdiff
|
tree
2009-11-30
J
u
n
i
o C
Hama
n
o
Merge bran
c
h 'mm/maint-
m
erge-ff-error-message-fix
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
M
e
rge branc
h
'
a
p/maint-merge-
s
trategy-list-fix'
commit
|
commitdiff
|
tree
2009-11-30
J
u
n
i
o C Ham
a
no
Me
r
ge branch '
j
c
/
pret
t
y-lf'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'cc/bisect-do
c
'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o C
H
a
mano
Mer
g
e branch 'em/com
m
it-c
l
aim'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C Ha
m
ano
M
erge bran
c
h 'jc/mai
l
inf
o
-remove-bracke
t
s'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o C Hamano
Merge branch '
f
c/send-email-envelop
e
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ham
a
no
Merge branch
'uk/main
t
-s
h
ortlog-en
c
oding'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o C H
a
mano
Merge b
r
anch 'ns/send-
e
mail-n
o
-ch
a
in-
r
eply-to'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C
H
amano
Merge branch
'
jc/main
t
-am-
k
eep'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Haman
o
Merge branc
h
'bw/diff-color-hunk-header'
commit
|
commitdiff
|
tree
2009-11-28
J
unio C Ha
m
ano
Update d
r
af
t
relea
s
e notes t
o
1
.
6
.
6 b
e
fore 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 empty <SET><R
E
SET
>
followed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Hamano
Remove dead c
o
de from "git
am
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C
H
amano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-11-27
Junio
C Ham
a
no
builti
n
-apply
.
c: pay
a
tte
n
tion to
-
p<n> when determin
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
Junio C H
a
mano
Merge branc
h
'rs/wor
k
-aroun
d
-g
r
ep-
o
pt-insanity'
commit
|
commitdiff
|
tree
2009-11-24
Ju
n
io C Hamano
Merge b
r
anch
'rj/maint-cygwin-count-objec
t
s'
commit
|
commitdiff
|
tree
2009-11-24
J
u
nio C Hamano
Merge b
r
a
n
ch 'rs/
c
o
l
or-escape-has-zero
-
w
i
dt
h
'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Haman
o
Merge br
a
n
ch 'bg/apply-d
o
c
'
commit
|
commitdiff
|
tree
2009-11-24
J
u
nio
C
Ham
a
n
o
Merge branch 'mm/maint-hint
-
failed-
m
erge'
commit
|
commitdiff
|
tree
2009-11-24
Junio C
H
amano
M
e
rge bran
c
h '
j
c/log-stdin'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Merge branch 'mr/gitweb-snapshot'
commit
|
commitdiff
|
tree
2009-11-24
Junio
C Hamano
Merge b
r
a
n
c
h
'cc/re
p
l
a
ce'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2009-11-24
Ju
n
io C
Hamano
P
r
otect scripted Porcelains fro
m
GREP_OPTION
S
insa
n
ity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Juni
o
C Haman
o
Add trivia
l
tests for --
s
tdin
option to log family
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Mer
g
e branch 'bg/fetc
h
-mult
i
'
commit
|
commitdiff
|
tree
2009-11-23
Jun
i
o
C
H
a
mano
Git v1
.
6
.
6
-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Junio C H
a
m
a
n
o
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
M
e
rge git://git
.
b
ogomips
.
or
g
/
g
i
t-svn
commit
|
commitdiff
|
tree
2009-11-23
Junio
C
H
a
mano
Merge
br
a
n
ch 't
h
/ma
i
nt-remote
-
up
d
ate-help-st
r
in
g
'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Me
r
ge branch 'jn/f
a
ster
-
completio
n
-s
t
artup'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hama
n
o
Merge branch 'r
j
/
m
aint-
t
9700'
commit
|
commitdiff
|
tree
next