repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more
2014-11-10
Junio C Hamano
Merg
e
b
r
anch
'jc/
c
onflict-hin
t
' int
o
cc/interpret-trailers
.
.
.
commit
|
commitdiff
|
tree
2014-10-28
Junio C Hamano
merg
e
&
sequen
c
er: turn "Conflicts:" hint
i
nto a commen
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-28
Junio
C
Hamano
builtin/c
o
mmit
.
c: extra
c
t ignore_non_tr
a
iler() he
l
per
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-24
Junio C Hamano
merg
e
& se
q
uencer: unif
y
codepath
s
t
hat write
"
Conflicts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-24
Juni
o
C Hamano
builtin/merge
.
c:
dro
p
a
p
aramete
r
t
hat is never used
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-11
Junio C Hamano
Update dra
f
t
r
elease no
t
es to
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-11
J
un
i
o
C
Hamano
M
erge bra
n
ch 'br/imap-sen
d
-
s
implify-tun
n
el-c
h
ild-process'
commit
|
commitdiff
|
tree
2014-09-11
Junio C Hamano
Merge br
a
nch 'jk/na
m
e-decoration-alloc'
commit
|
commitdiff
|
tree
2014-09-11
J
unio
C
Hamano
Merg
e
b
r
an
c
h
'jn/unpack-trees-check
o
ut-
m
-c
a
rry-dele
t
ion'
commit
|
commitdiff
|
tree
2014-09-11
Jun
i
o C Hamano
Me
r
ge
b
ra
n
ch 'rs/list-optim'
commit
|
commitdiff
|
tree
2014-09-11
Junio C Haman
o
Merge
b
r
anch '
j
k/fast-imp
o
rt-
f
ix
e
s'
commit
|
commitdiff
|
tree
2014-09-11
Junio C Hamano
M
er
g
e
branch 'jk/prun
e
-
t
op-level-
r
e
f
s-after-packin
g
'
commit
|
commitdiff
|
tree
2014-09-11
Junio C Ham
a
no
Merge b
r
a
n
c
h
'
nd/large-blobs'
commit
|
commitdiff
|
tree
2014-09-11
J
u
nio C Hamano
M
e
r
g
e branch 'nd
/
fetch-
p
ass-quiet-t
o
-gc-child-proces
s
'
commit
|
commitdiff
|
tree
2014-09-11
Junio C Hama
n
o
Merge branch 'd
t
/cache-tree-rep
a
ir'
commit
|
commitdiff
|
tree
2014-09-11
Juni
o
C H
a
mano
M
erge branch 'rs/ref-trans
a
ction-1'
commit
|
commitdiff
|
tree
2014-09-11
Junio C Hamano
M
er
g
e branch 'nd/m
v
-c
o
de-cleaning'
commit
|
commitdiff
|
tree
2014-09-11
Junio C Hamano
Merge bra
n
ch 'mm/discour
a
ge-
c
ommit-a-
t
o-finish-conflict
.
.
.
commit
|
commitdiff
|
tree
2014-09-11
J
unio C Hamano
Merge branch 'jk
/
m
a
ke-simplif
y
-dependencies'
commit
|
commitdiff
|
tree
2014-09-11
Junio C Hamano
Merge
b
r
anch 'et
/
s
pell
-
poll-i
n
finite-with-minus-one
.
.
.
commit
|
commitdiff
|
tree
2014-09-11
Junio C Hamano
Merge branch
'
br/
h
ttp-init-fix'
commit
|
commitdiff
|
tree
2014-09-11
J
u
nio C
H
amano
Merge
b
r
a
n
ch
'rs/child-process-i
n
it'
commit
|
commitdiff
|
tree
2014-09-11
Junio C Hamano
Merge branc
h
'jk/co
n
trib-subt
r
ee-make-all'
commit
|
commitdiff
|
tree
2014-09-11
Ju
n
io
C Ha
m
ano
Merge b
r
anch 'ta/
c
onfig
-
set-2'
commit
|
commitdiff
|
tree
2014-09-11
Jun
i
o C Hamano
M
e
rge
b
ranch
'
t
a
/config-set-1'
commit
|
commitdiff
|
tree
2014-09-09
J
u
nio C Hamano
U
pdate draft release n
o
tes to 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-09
Junio C Hama
n
o
Me
r
ge
b
ra
n
ch 'sp/p
a
ck-protocol-doc-on-shallow'
commit
|
commitdiff
|
tree
2014-09-09
Junio C Hamano
Me
r
ge branch
'tf
/
i
m
ap-send-cr
e
ate'
commit
|
commitdiff
|
tree
2014-09-09
Junio C H
a
mano
Merge br
a
n
c
h
'jk/prompt-
s
tash-could-be-packed'
commit
|
commitdiff
|
tree
2014-09-09
Junio C Hamano
Merge bran
c
h
'tb/pretty-format-cd-
d
ate-format'
commit
|
commitdiff
|
tree
2014-09-09
Ju
n
io C
H
amano
Merge branch 'r
s
/inline-compat-p
a
th-ma
c
ros'
commit
|
commitdiff
|
tree
2014-09-09
Junio
C
H
amano
Merg
e
branch
'
rs/clean-m
e
nu
-
i
tem-
d
efn'
commit
|
commitdiff
|
tree
2014-09-09
Junio
C Hamano
Me
r
ge br
a
nch 'jc/config-mak-documen
t
-da
r
w
i
n
-vs-macosx'
commit
|
commitdiff
|
tree
2014-09-09
Junio C
Hama
n
o
M
e
rge branch 'sb/mailsplit-dead-cod
e
-r
e
mo
v
al'
commit
|
commitdiff
|
tree
2014-09-09
Ju
n
i
o C Ham
a
no
Merge branch 'so/r
e
base-doc
'
commit
|
commitdiff
|
tree
2014-09-09
J
unio C Hamano
Merge bran
c
h 'sb
/
prepare-revision-wa
l
k-error-check'
commit
|
commitdiff
|
tree
2014-09-09
Junio C Hamano
Merge b
r
anc
h
'sb/b
l
ame-m
s
g-i18n'
commit
|
commitdiff
|
tree
2014-09-09
J
u
ni
o
C Hama
n
o
Merg
e
branch 'nd/strbuf-utf8-
r
e
pla
c
e'
commit
|
commitdiff
|
tree
2014-09-09
J
u
n
i
o C Hamano
M
e
rg
e
bran
c
h 'sb/plug-leaks'
commit
|
commitdiff
|
tree
2014-09-09
Junio C Hama
n
o
M
e
r
g
e bra
n
c
h
'rs/re
f
r
esh-beyond-symlink'
commit
|
commitdiff
|
tree
2014-09-09
Junio
C Hamano
Merge br
a
nch 'la/init-doc'
commit
|
commitdiff
|
tree
2014-09-09
Junio C Hamano
Merge
b
r
anch '
j
k/st
a
sh-list-p'
commit
|
commitdiff
|
tree
2014-09-09
Juni
o
C
H
amano
Merge b
r
anc
h
'
m
m
/
log-
b
ranch-desc-plug-leak'
commit
|
commitdiff
|
tree
2014-09-09
Junio C Hamano
M
e
r
ge br
a
nc
h
'
lf/
b
un
d
le-e
x
clusion
'
commit
|
commitdiff
|
tree
2014-09-09
Jun
i
o C Ham
a
n
o
Merge branch 'jc
/
apply-
w
s-
p
re
f
i
x
'
commit
|
commitdiff
|
tree
2014-09-09
Junio C Hamano
Merge branch 'jk/
c
om
m
and-line-config-emp
t
y-string'
commit
|
commitdiff
|
tree
2014-09-09
Junio C Haman
o
Merge br
a
n
ch 'bc/imap-
s
end-doc'
commit
|
commitdiff
|
tree
2014-09-09
Junio C Hamano
Merge branch 'jc/not-mingw-cygwin'
commit
|
commitdiff
|
tree
2014-09-03
Junio C
Hamano
cache-tree:
d
o
n
o
t try
t
o us
e
an in
v
alidated subtre
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-02
Junio C Hama
n
o
Start the
p
ost-2
.
1 cy
c
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-02
Junio C Hamano
Merg
e
b
ran
c
h
'
rs/strbuf-get
c
w
d
'
commit
|
commitdiff
|
tree
2014-09-02
Ju
n
io C Ham
a
no
Merge
b
r
a
nch
'ta/pret
t
y
-
parse-config'
commit
|
commitdiff
|
tree
2014-09-02
Junio
C Hamano
Merge
br
a
nc
h
'b
c
/archive-pax-
h
ead
e
r-mode'
commit
|
commitdiff
|
tree
2014-09-02
Junio C Hamano
Mer
g
e bran
c
h 'pr/re
m
o
t
e
s
-in-
h
ash
m
ap'
commit
|
commitdiff
|
tree
2014-09-02
Junio
C
Ha
m
ano
Merge branch 'jk/pretty-em
p
ty-for
m
a
t
'
commit
|
commitdiff
|
tree
2014-09-02
J
u
nio C Hama
n
o
Merge
b
ranch
'
t
a
/
config-set'
commit
|
commitdiff
|
tree
2014-09-02
Junio C Ham
a
n
o
Merge branch 'rs/i
n
i
t
-n
o
-dup
l
icate-real-pa
t
h'
commit
|
commitdiff
|
tree
2014-09-02
Junio C Hamano
Me
r
ge branch 'm
m
/c
o
nfig-edit-global'
commit
|
commitdiff
|
tree
2014-09-02
Jun
i
o C Hamano
Merge br
a
nch 'jc/reopen-lock-f
i
le'
commit
|
commitdiff
|
tree
2014-08-29
Juni
o
C H
a
mano
Merge gi
t
://g
i
thub
.
com/git
-
l
10
n
/
g
it
-
po
commit
|
commitdiff
|
tree
2014-08-26
J
unio C Hamano
Merge b
r
anch 'jk/diff-tre
e
-t-
f
ix'
commit
|
commitdiff
|
tree
2014-08-26
Junio C H
a
man
o
Merge branch 'jk/pack
-
shallow-always-without-bi
t
m
a
p'
commit
|
commitdiff
|
tree
2014-08-26
Junio C H
a
m
ano
Merge
b
r
a
nch '
j
k/fix-prof
i
le-
f
eedback-bui
l
d'
commit
|
commitdiff
|
tree
2014-08-25
Junio C Hamano
Merge
g
i
t://g
i
thu
b
.
com/git-l10n
/
git-po
commit
|
commitdiff
|
tree
2014-08-15
Junio C
Hamano
G
it 2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-15
Junio C Hamano
config
.
mak
.
uname: add hin
t
on
uname_R for
M
acOS X
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-10
J
unio C Hamano
Merge br
a
n
c
h 'master'
o
f git
:
//ozlab
s
.
org/~paulus/git
k
commit
|
commitdiff
|
tree
2014-08-08
J
u
nio C
Hamano
Git 2
.
1
-
rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-07
Junio C H
a
mano
apply: om
i
t w
s
ch
e
ck for ex
c
luded paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-07
Junio C Ha
m
ano
apply: hoist u
s
e_patc
h
() helper for path exclusion
up
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-07
Ju
n
io C Haman
o
apply
:
u
se the r
i
gh
t
attribute for paths in non-Git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-07
Junio
C
Hamano
M
e
rge
b
ranch 'mb/reln
o
tes-2
.
1'
commit
|
commitdiff
|
tree
2014-08-05
J
un
i
o C Haman
o
RelNotes: no more c
h
eck_
r
ef_for
m
at micro-optimization
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-05
Junio C Ha
m
ano
config: teach "git
-
c" to re
c
ognize an emp
t
y string
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-04
Junio C Hamano
Git 2
.
1
.
0-
r
c1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-04
Junio C Hamano
Merge branch
'tf/maint-doc-
p
ush
'
commit
|
commitdiff
|
tree
2014-08-04
Junio C Hamano
Merge branch 'ta/doc-con
f
ig'
commit
|
commitdiff
|
tree
2014-07-30
J
u
nio C Hamano
Sync wit
h
2
.
0
.
4
commit
|
commitdiff
|
tree
2014-07-30
J
u
n
i
o
C Hamano
Updat
e
draft r
e
lease notes
to 2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-07-30
Juni
o
C Hamano
Me
r
ge branch
'
j
k
/
more-
p
ush-completion'
commit
|
commitdiff
|
tree
2014-07-30
Junio C
H
amano
Merge branch '
s
k/mingw
-
te
s
ts-workaround'
commit
|
commitdiff
|
tree
2014-07-30
Junio C Hama
n
o
Merge branch
'
sk/mingw-uni
-
f
i
x-
m
ore'
commit
|
commitdiff
|
tree
2014-07-30
Ju
n
io C
H
aman
o
Merge bran
c
h 'ep/avoid-test-a-o'
commit
|
commitdiff
|
tree
2014-07-30
Junio
C Ha
m
ano
Git
2
.
0
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-07-28
Jun
i
o
C Ha
m
ano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2014-07-28
Junio C Hamano
Merge br
a
nch 'jk/misc
-
fix
e
s-maint'
commit
|
commitdiff
|
tree
2014-07-28
J
unio C
Hamano
Revert "Mer
g
e branch 'dt/refs-check-refname-co
m
po
n
ent
.
.
.
commit
|
commitdiff
|
tree
2014-07-28
Junio
C Hamano
Rever
t
"Merg
e
branch 'dt/refs-che
c
k-re
f
name-componen
t
.
.
.
commit
|
commitdiff
|
tree
2014-07-28
Junio C Hamano
M
e
rge bra
n
ch
'jk/
a
lloc-c
o
mmit-id-main
t
' into ma
i
n
t
commit
|
commitdiff
|
tree
2014-07-27
J
u
nio
C
Hamano
Git
2
.
1
.
0-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-07-27
Junio
C
Haman
o
Merge
b
ranch 'j
k
/reba
s
e-
a
m-fork-point
'
commit
|
commitdiff
|
tree
2014-07-27
Junio C Ha
m
ano
Merg
e
branch 'cc/
r
eplace-graft'
commit
|
commitdiff
|
tree
2014-07-27
Ju
n
io
C
Hamano
Me
r
ge
b
ranch 'jk/stable
-
prio
-
queue'
commit
|
commitdiff
|
tree
2014-07-25
Juni
o
C Hamano
t9814: fix mis
c
o
nversion from tes
t
$a -o $b to
t
est
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-07-23
Junio C Hama
n
o
Sync
w
ith
v
2
.
0
.
3
commit
|
commitdiff
|
tree
2014-07-23
Junio C Hamano
M
erge
b
ra
n
ch 'rs/fix-unli
n
k-unix-socket'
commit
|
commitdiff
|
tree
2014-07-23
Jun
i
o C
Hamano
M
erge b
r
an
c
h 'ta
/
string-list
-
init'
commit
|
commitdiff
|
tree
2014-07-23
Junio C Hama
n
o
M
erge branch 'mb/local-c
l
o
n
e
-after-appl
y
i
ng-insteadof'
commit
|
commitdiff
|
tree
2014-07-23
Junio C H
a
m
a
no
M
e
r
ge branch 'jk/tag-sort'
commit
|
commitdiff
|
tree
2014-07-23
Junio C Hamano
Git 2
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next