repo.or.cz
/
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
Merge branch 'jc/co
n
flic
t
-hint' in
t
o cc/interpr
e
t-trailers
.
.
.
commit
|
commitdiff
|
tree
2014-10-28
Junio
C Haman
o
merg
e
& sequencer: turn
"Co
n
flicts:" h
i
nt int
o
a
comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-28
J
u
nio
C
H
ama
n
o
b
u
iltin/com
m
it
.
c: extract ignore_non
_
trailer
(
)
helper
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-24
Junio C
Hamano
me
r
ge
&
sequ
e
ncer: uni
f
y codepaths that w
r
ite "Conflicts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-24
Junio C Hamano
bui
l
t
in/mer
g
e
.
c: drop a parameter that i
s
n
e
ve
r
u
sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-11
Junio C Hamano
Update draft rel
e
ase notes to 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-11
J
u
nio C Hamano
Me
r
ge bra
n
ch
'b
r
/imap-s
e
nd-simp
l
ify-
t
unn
e
l-child-pro
c
ess'
commit
|
commitdiff
|
tree
2014-09-11
Junio C Hamano
Merge bra
n
ch 'jk
/
name-decorat
i
on-a
l
loc'
commit
|
commitdiff
|
tree
2014-09-11
Junio C Hamano
Merge
b
ranc
h
'jn/un
p
ack-tree
s
-che
c
k
o
u
t-m-carry-de
l
etion'
commit
|
commitdiff
|
tree
2014-09-11
J
u
n
i
o
C Ha
m
ano
Merge branc
h
'rs/list-opt
i
m'
commit
|
commitdiff
|
tree
2014-09-11
Junio C
Ham
a
no
M
e
rge br
a
nch 'j
k
/fast-import-fix
e
s'
commit
|
commitdiff
|
tree
2014-09-11
Junio
C Hamano
Merge branch
'
j
k
/prune-to
p
-
l
e
v
el-refs
-
after-packing'
commit
|
commitdiff
|
tree
2014-09-11
Junio
C Hamano
M
erg
e
branch 'nd/lar
g
e-bl
o
bs'
commit
|
commitdiff
|
tree
2014-09-11
J
u
nio C Hamano
Me
r
ge branch '
n
d/fetch-
p
a
s
s-qu
i
et-to
-
gc-child-pro
c
ess'
commit
|
commitdiff
|
tree
2014-09-11
Junio C Haman
o
Merge b
r
anch 'dt/cache-tr
e
e-repa
i
r'
commit
|
commitdiff
|
tree
2014-09-11
Junio C
Hamano
Merge b
r
anch 'rs/ref-tr
a
n
s
action-1
'
commit
|
commitdiff
|
tree
2014-09-11
Junio
C
Hamano
Merge branch 'nd
/
mv
-
code-cleaning'
commit
|
commitdiff
|
tree
2014-09-11
Jun
i
o C Hamano
Merge
bra
n
ch 'mm/disc
o
urage-
c
omm
i
t-
a
-t
o
-finis
h
-c
o
nfli
c
t
.
.
.
commit
|
commitdiff
|
tree
2014-09-11
J
u
nio C
H
amano
Merge
br
a
n
c
h 'jk/make-s
i
mplify-dependencies
'
commit
|
commitdiff
|
tree
2014-09-11
Juni
o
C H
a
mano
Merg
e
branch
'et
/
spe
l
l-poll-inf
i
nite-
w
ith-minus-one
.
.
.
commit
|
commitdiff
|
tree
2014-09-11
Junio
C Hamano
Merge branch 'br/
h
ttp-i
n
i
t
-
fix'
commit
|
commitdiff
|
tree
2014-09-11
Junio C Hamano
Merg
e
bra
n
ch 'rs/chi
l
d
-pro
c
ess-init'
commit
|
commitdiff
|
tree
2014-09-11
Junio C H
a
mano
Merge
branch 'jk/
c
ontrib-
s
ubtree-
m
ake-all'
commit
|
commitdiff
|
tree
2014-09-11
J
u
nio C
H
aman
o
Merge branch 'ta/config-set-2'
commit
|
commitdiff
|
tree
2014-09-11
J
u
n
io C
Hamano
Merge
b
r
anch 't
a
/config-set
-
1'
commit
|
commitdiff
|
tree
2014-09-09
Jun
i
o C Ha
m
ano
Update dr
a
f
t
release not
e
s to 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-09
Junio C Hamano
Merge branch
'
sp
/
pa
c
k-protoc
o
l
-
doc-on-
s
hallow'
commit
|
commitdiff
|
tree
2014-09-09
Jun
i
o C H
a
ma
n
o
Merg
e
branch
'tf/imap-s
e
nd
-
cr
e
a
t
e'
commit
|
commitdiff
|
tree
2014-09-09
Junio C Hamano
Merge branch 'jk/
p
rompt-stash-
c
ould-be-packed'
commit
|
commitdiff
|
tree
2014-09-09
Junio C Hamano
Merge branch 'tb/pret
t
y-f
o
rmat-cd-d
a
te-format'
commit
|
commitdiff
|
tree
2014-09-09
J
u
nio C Hamano
Merge b
r
anch 'rs/inline-com
p
a
t
-path-macro
s
'
commit
|
commitdiff
|
tree
2014-09-09
Junio C Hamano
Me
r
ge branch 'r
s
/cl
e
an-menu-ite
m
-
d
efn'
commit
|
commitdiff
|
tree
2014-09-09
J
uni
o
C Ha
m
ano
Merg
e
branch 'jc/config-ma
k
-docu
m
ent-da
r
win-vs-macosx'
commit
|
commitdiff
|
tree
2014-09-09
Junio
C
Hamano
Merge br
a
n
c
h
'
sb/mailsp
l
it-dead-
c
ode-removal'
commit
|
commitdiff
|
tree
2014-09-09
Junio C Hamano
Me
r
ge branch
'
so/rebase
-
doc'
commit
|
commitdiff
|
tree
2014-09-09
Jun
i
o C Hamano
Merge bran
c
h
'
sb/
p
repare-revisio
n
-wa
l
k-e
r
ror-check'
commit
|
commitdiff
|
tree
2014-09-09
Jun
i
o C Hamano
Merge branch 's
b
/bl
a
me-msg-i18n
'
commit
|
commitdiff
|
tree
2014-09-09
Junio C Ha
m
ano
Merge branc
h
'nd/s
t
rbuf-ut
f
8-replac
e
'
commit
|
commitdiff
|
tree
2014-09-09
J
unio C Ham
a
n
o
Merge branch 'sb/plug-leaks'
commit
|
commitdiff
|
tree
2014-09-09
Junio C Hamano
M
e
rge
b
ra
n
ch 'rs/ref
r
e
s
h
-beyond-sym
l
ink'
commit
|
commitdiff
|
tree
2014-09-09
Jun
i
o C Hamano
M
erge branch 'la/in
i
t
-
doc'
commit
|
commitdiff
|
tree
2014-09-09
Junio C Haman
o
Merge
b
ranch 'jk/sta
s
h-list-p'
commit
|
commitdiff
|
tree
2014-09-09
Junio C Hamano
M
erge branch '
m
m/log-branch-desc-plug-leak'
commit
|
commitdiff
|
tree
2014-09-09
Junio C Ha
m
ano
Merge branch 'lf/bundle-exclusion'
commit
|
commitdiff
|
tree
2014-09-09
Juni
o
C Haman
o
Me
r
ge branch 'jc/apply-
w
s-prefix'
commit
|
commitdiff
|
tree
2014-09-09
Junio C Hamano
Merge branch 'jk/command-line-
c
onfig-
e
mp
t
y-s
t
ring'
commit
|
commitdiff
|
tree
2014-09-09
Junio C Hamano
Mer
g
e br
a
nc
h
'bc/i
m
a
p
-
s
end-
d
oc'
commit
|
commitdiff
|
tree
2014-09-09
Junio
C Hamano
Merge
branch 'jc
/
not-mingw-
c
y
g
win'
commit
|
commitdiff
|
tree
2014-09-03
Junio C
Hamano
c
ache-tree:
d
o
not try
to use an
invalidated subt
r
ee
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-02
J
u
nio C
H
amano
Start
t
h
e
post-2
.
1 cyc
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-09-02
J
unio C Hamano
Merge branch 'rs/strbuf-get
c
wd
'
commit
|
commitdiff
|
tree
2014-09-02
J
unio
C Hamano
Merge
b
r
a
nc
h
'
ta/pretty-parse-config'
commit
|
commitdiff
|
tree
2014-09-02
Junio C
Hama
n
o
Merge branch 'bc
/
archive-pa
x
-hea
d
er-
m
ode'
commit
|
commitdiff
|
tree
2014-09-02
Junio
C H
a
ma
n
o
M
e
r
ge
branch 'pr/rem
o
tes-in-h
a
sh
m
ap'
commit
|
commitdiff
|
tree
2014-09-02
Junio C Hamano
Me
r
ge branch 'j
k
/pretty-empty-format'
commit
|
commitdiff
|
tree
2014-09-02
Junio C Hamano
M
e
rge
branch 'ta/con
f
ig-se
t
'
commit
|
commitdiff
|
tree
2014-09-02
J
u
nio C Hamano
M
e
r
ge branch 'rs/init-no-duplicate-real-p
a
th'
commit
|
commitdiff
|
tree
2014-09-02
Junio
C
Haman
o
Merge branch
'mm/co
n
f
i
g
-
edit-global'
commit
|
commitdiff
|
tree
2014-09-02
J
u
nio C Hamano
Merg
e
branch
'jc/
r
eo
p
en-lock-file'
commit
|
commitdiff
|
tree
2014-08-29
J
u
nio C Hamano
M
e
r
ge g
i
t
:
/
/
g
i
thub
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2014-08-26
Junio C
H
amano
Mer
g
e branch 'jk/diff-tree-t-fix'
commit
|
commitdiff
|
tree
2014-08-26
Junio C Hamano
M
e
rge
branch 'j
k
/pack-shallow-al
w
ays-without-bitmap'
commit
|
commitdiff
|
tree
2014-08-26
Junio C Hamano
Merg
e
branch 'jk/f
i
x-pro
f
ile-feedback-bu
i
l
d'
commit
|
commitdiff
|
tree
2014-08-25
Ju
n
io C Hamano
Me
r
ge g
i
t:
/
/github
.
c
om/git-l10n/git-po
commit
|
commitdiff
|
tree
2014-08-15
Junio C Hamano
Git 2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-15
Junio
C Hamano
conf
i
g
.
mak
.
u
n
ame: add hin
t
on
u
name_R for M
a
cOS X
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-10
Junio C
Hamano
Merge
branch 'master'
o
f
gi
t
:
/
/ozla
b
s
.
org/~paulus/git
k
commit
|
commitdiff
|
tree
2014-08-08
Junio C Hamano
Git 2
.
1
-
rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-07
Junio C Hamano
apply:
o
mit ws check
f
o
r
exc
l
uded paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-07
Junio C Ham
a
no
apply: hoist use_patch()
h
e
lper for path exclusion
up
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-07
Junio C
Hamano
a
p
ply: use the right attribute for paths in non
-
Git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-07
Junio C
H
a
mano
Merge branc
h
'mb/relno
t
e
s
-2
.
1'
commit
|
commitdiff
|
tree
2014-08-05
J
u
nio C
H
a
m
an
o
RelNotes:
no more check
_
ref_format micro-opt
i
mizat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-05
Junio C H
a
m
a
no
c
o
n
f
ig: teach "
g
i
t
-
c
" to recog
n
ize an
empty
s
tr
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-04
Junio C Hamano
Git 2
.
1
.
0-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-04
Jun
i
o
C
H
a
mano
Merg
e
branch 'tf/maint-
d
oc-push
'
commit
|
commitdiff
|
tree
2014-08-04
J
u
nio C
Hamano
M
e
rge branch 'ta/doc-config'
commit
|
commitdiff
|
tree
2014-07-30
Junio C Ha
m
an
o
Sync with 2
.
0
.
4
commit
|
commitdiff
|
tree
2014-07-30
Jun
i
o C Hamano
Update draft releas
e
notes to 2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-07-30
J
u
nio C
Haman
o
Merge bran
c
h
'
j
k/more-push-comple
t
io
n
'
commit
|
commitdiff
|
tree
2014-07-30
J
u
n
i
o C Hamano
Merge branch 'sk/
m
ing
w
-tests-w
o
rk
a
round'
commit
|
commitdiff
|
tree
2014-07-30
Jun
i
o C Hamano
Mer
g
e branch 'sk/
m
in
g
w-
u
ni-fix
-
more'
commit
|
commitdiff
|
tree
2014-07-30
Juni
o
C
Haman
o
Merge branch 'ep/avoid-test-a-
o
'
commit
|
commitdiff
|
tree
2014-07-30
Jun
i
o C Hamano
G
i
t 2
.
0
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-07-28
Junio C Hamano
M
erge branch '
m
aint'
commit
|
commitdiff
|
tree
2014-07-28
Junio C
Haman
o
Merge bran
c
h
'j
k
/
m
i
s
c-fi
x
es-maint'
commit
|
commitdiff
|
tree
2014-07-28
Junio C Hamano
Rever
t
"Merge branch
'
dt/refs-chec
k
-refna
m
e
-
compon
e
nt
.
.
.
commit
|
commitdiff
|
tree
2014-07-28
Junio
C
H
a
mano
R
e
vert "M
e
rge branc
h
'dt/r
e
f
s
-
check-refname-componen
t
.
.
.
commit
|
commitdiff
|
tree
2014-07-28
Junio C H
a
m
a
no
Merge branch 'jk/alloc-c
o
mmit-id-maint' into mai
n
t
commit
|
commitdiff
|
tree
2014-07-27
Junio C Hamano
Git 2
.
1
.
0-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-07-27
Junio C Hamano
Merge b
r
an
c
h 'jk/rebase-am-
f
ork-point'
commit
|
commitdiff
|
tree
2014-07-27
J
u
nio C
Ha
m
a
n
o
Merge b
r
anch 'cc/re
p
lace-graft'
commit
|
commitdiff
|
tree
2014-07-27
Junio
C
H
a
m
ano
Merge branch '
j
k
/
stable-prio-queue'
commit
|
commitdiff
|
tree
2014-07-25
Juni
o
C
H
amano
t9814: fix m
i
sconv
e
rsion from test
$a
-
o
$
b to te
s
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-07-23
Junio C Haman
o
Syn
c
with v2
.
0
.
3
commit
|
commitdiff
|
tree
2014-07-23
Junio C Hamano
Merge b
r
anch 'rs/fix
-
unl
i
nk-unix-so
c
ket'
commit
|
commitdiff
|
tree
2014-07-23
J
unio
C
H
a
man
o
Mer
g
e bra
n
ch 'ta/string-li
s
t-init'
commit
|
commitdiff
|
tree
2014-07-23
Junio C
H
ama
n
o
Merge branch 'mb/lo
c
al-clone
-
a
f
ter-app
l
ying-insteadof'
commit
|
commitdiff
|
tree
2014-07-23
Juni
o
C
Haman
o
Mer
g
e branch
'jk/tag-sort'
commit
|
commitdiff
|
tree
2014-07-23
Junio C H
a
mano
Git 2
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next