repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
more D/F conflict tests
2010-01-04
Junio
C
H
aman
o
mor
e
D/F
conf
l
ict te
s
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Juni
o
C Ham
a
n
o
tests: move conv
e
nience regexp to
m
atc
h
object
n
am
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
Junio
C Hamano
Git
1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
Jun
i
o C Hamano
M
e
rge branch 'm
a
int'
commit
|
commitdiff
|
tree
2009-12-20
Junio C Ha
m
ano
G
i
t 1
.
6
.
6
-
rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2009-12-16
Juni
o
C Haman
o
Git
1
.
6
.
6-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio
C
H
aman
o
Merge
b
ranch 'maint' to sync with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
J
unio C
H
a
m
a
n
o
Git
1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
J
unio C
H
amano
worktree: don't segfault with an absolute pathspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Hamano
U
pdate Rel
e
ase Notes for 1
.
6
.
6
to remove ol
d
bugfixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Jun
i
o C
Ham
a
no
Sync wit
h
1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hama
n
o
Git 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Juni
o
C
Hamano
Fix
archive f
o
rmat with -- on
t
he
command lin
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Haman
o
Remove po
s
t-uploa
d
-hoo
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
J
u
nio C
Ham
a
no
Git 1
.
6
.
6-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C Hamano
Merge
g
it://
r
e
po
.
o
r
.
c
z
/g
i
t-gui
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hama
n
o
Merge g
i
t://g
i
t
.
k
e
rnel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Ha
m
ano
Upd
a
te
d
raf
t
release notes t
o
1
.
6
.
6 bef
o
re -rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
J
unio
C Hamano
Merge
branch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io C
Hamano
M
erge branch 'mm/main
t
-merge-
f
f-error-message-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge branch 'jn/maint-
p
ull-r
e
base-error-messag
e
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ha
m
an
o
Merge branc
h
'jk/maint-add-p-d
e
lete-fix' into maint
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C Hamano
Merge git://
g
it
.
bo
g
omips
.
org/git
-
s
vn
commit
|
commitdiff
|
tree
2009-12-08
J
unio
C
Ha
m
a
no
Revert r
e
cent
"
g
it merge <ms
g
>
HEAD
<
commit>
.
.
.
" deprecation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Ju
n
io
C
H
amano
Syn
c
with 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hamano
Git
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Ha
m
ano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Ha
m
ano
Prepare for 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io
C
H
amano
Merg
e
br
a
nch 'uk/maint-s
h
o
rtlo
g
-encoding' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Me
r
ge
b
ra
n
ch
'
f
c/maint-format-patch-pathspec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio
C Ha
m
ano
M
e
rge
b
r
a
n
c
h
'
ap/maint-merge-strate
g
y-
l
ist
-
fix
'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C
H
a
mano
Merge branch 'jc
/
maint-am-ke
e
p
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Mer
g
e b
r
anch 'rs/work-around-
g
rep-o
p
t-in
s
anity' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Haman
o
Merge
b
ranch 'r
j
/ma
i
nt-cygwin
-
c
o
u
nt-objects' int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
M
erge
b
r
a
nch 'mm/m
a
int-hint-f
a
iled-me
r
g
e' int
o
mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
erg
e
bran
c
h 'th/maint-remote-
u
pdate-help-
s
tring' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Ham
a
n
o
Merge branch
'rj/maint
-
t9700' into
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merge
branch 'ls/maint-
m
ailinfo-no-inbod
y
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'mo/ma
i
nt-crlf-doc' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C H
a
m
a
no
Me
r
g
e
branch 'th/remote-usage
'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
am
a
no
Merge branch
'pb
/
maint-us
e
-custom-perl' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
i
o
C
Hamano
Merge
branch 'mm/config-
p
athname-tilde-expand' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
i
o C Hamano
M
erge
b
ra
n
ch 'bc/grep-i-F
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
M
e
rge branc
h
'jk/maint-brea
k
-rename-reduce-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
erge
branc
h
'rj/maint-simpli
f
y
-
cygwin-makefile' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C
Hamano
Merge
br
a
n
c
h 'rg/doc
-
wo
r
kf
l
ow
'
into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
a
n
o
Merge branch 'n
p
/m
a
int-sideband-f
a
vor
-
sta
t
us' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Documentatio
n
:
x
mlto 0
.
0
.
18 does
n
ot know
--str
i
ng
p
aram
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
ni
o
C H
a
mano
M
e
rge
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
J
u
nio C Haman
o
Unconditionally se
t
man
.
b
as
e
.
url
.
for
.
relative
.
links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Documentation/M
a
kefile: al
l
ow man
.
base
.
u
r
l
.
fo
r
.
relative
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Gi
t
1
.
6
.
6-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
io C Ham
a
n
o
M
erge branch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
P
r
epare fo
r
1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
m
e
rge: do
not add standard m
e
s
s
a
ge when message is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Do not mis
i
dentify
"
git merge foo HEAD" a
s
a
n
old-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Ham
a
no
Update draf
t
release n
o
tes to 1
.
6
.
6
before -rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hama
n
o
Merge
b
ranch 'm
a
i
n
t
'
commit
|
commitdiff
|
tree
2009-12-01
J
u
nio C Hama
n
o
Merge branch 'jc/deprecate-old-syntax-from-merge'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
git-merge:
a
deprecation no
t
ice of
t
h
e ancient command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
Hamano
M
erge branch 'bw/remote
-
ge
t
-ref-states
-
fix'
commit
|
commitdiff
|
tree
2009-12-01
Junio C H
a
m
ano
Merge
branch 'jn/gitweb-b
l
am
e
'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
i
o C Ham
a
no
Me
r
g
e branch 'fc/m
a
int-format-patc
h
-pathspec-dashe
s
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'mm/maint
-
me
r
ge-ff-e
r
ror-me
s
sage-fix'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
i
o
C Ha
m
ano
Merge branch 'ap/maint-m
e
rge-stra
t
egy-
l
i
s
t-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
H
a
m
a
n
o
Merge
b
r
anch 'jc/
p
retty-lf'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o
C
Hamano
Merge bran
c
h 'cc
/
bis
e
ct
-
doc'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C Hamano
Merge branch 'e
m
/com
m
it-
c
laim'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C Hamano
Merg
e
branch 'jc/mailinfo-remove-bra
c
kets'
commit
|
commitdiff
|
tree
2009-11-30
J
unio
C Hamano
Merge branch 'fc/sen
d
-
e
m
a
il-
e
nvelop
e
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
H
amano
M
erge bran
c
h 'uk/maint-shortlog-enc
o
d
ing'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Haman
o
Me
r
ge branch 'ns/send
-
e
m
ail-
n
o-chain-rep
l
y-to'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch
'
jc/ma
i
nt-am-keep
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge b
r
a
n
c
h
'
bw/d
i
ff-col
o
r-hunk
-
h
eader'
commit
|
commitdiff
|
tree
2009-11-28
Junio C
H
aman
o
Update draft relea
s
e not
e
s t
o
1
.
6
.
6 before merging
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
Junio
C Haman
o
emit
_
line(): d
o
n't emit an empty <SET><RESET
>
followed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Ju
n
io
C Hama
n
o
Re
m
ove de
a
d code from "git am"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Ju
n
io C
Hamano
M
e
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2009-11-27
Junio C Hamano
builtin-
a
pply
.
c: pay attention to -p<n
>
when
d
etermining
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
Juni
o
C Hama
n
o
Merg
e
bra
n
ch 'rs/work-around-grep-opt-insanity'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Mer
g
e bra
n
ch 'rj/mai
n
t-cygwin-count-obj
e
cts'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Merge branch
'rs/co
l
or-escap
e
-has-zero-width'
commit
|
commitdiff
|
tree
2009-11-24
Junio
C
Ha
m
a
no
Merg
e
bra
n
ch 'bg
/
appl
y
-doc'
commit
|
commitdiff
|
tree
2009-11-24
Juni
o
C Hamano
M
e
rge bra
n
ch 'mm/main
t
-hint-f
a
iled
-
merge'
commit
|
commitdiff
|
tree
2009-11-24
Juni
o
C Hamano
Merg
e
branc
h
'jc/
l
og-stdin'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Ha
m
ano
Merge b
r
a
n
ch 'mr/gitweb
-
snapshot'
commit
|
commitdiff
|
tree
2009-11-24
Junio
C
H
a
mano
M
erge branch 'cc/repl
a
ce'
commit
|
commitdiff
|
tree
2009-11-24
Junio
C
H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Protect
scripted
P
orcela
i
ns from GREP_
O
PT
I
ONS insanity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Ju
n
i
o C Hamano
Add trivia
l
tests for --stdin option to log fa
m
ily
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Junio C
H
a
m
a
no
Me
r
ge branch 'bg/fe
t
ch-mul
t
i'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Git
v
1
.
6
.
6-
r
c
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Merge bra
n
ch
'
maint'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Haman
o
M
erge git:/
/
git
.
bogomips
.
o
rg/
g
it-svn
commit
|
commitdiff
|
tree
2009-11-23
Junio C Ha
m
ano
Merge b
r
anc
h
'
t
h/maint-remote-update-h
e
lp-stri
n
g'
commit
|
commitdiff
|
tree
2009-11-23
Junio C
Hamano
M
e
rge branch
'jn/f
a
ster-completion-startup'
commit
|
commitdiff
|
tree
2009-11-23
Juni
o
C Hamano
M
e
rge
branch 'rj/maint-t
9
700'
commit
|
commitdiff
|
tree
next