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
blame: allow "blame file" in the middle of a conflicted merge
2012-09-11
Junio C Hamano
bla
m
e: allow "blame f
i
le" in the mi
d
dle of a
conflict
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-11
Jun
i
o C Haman
o
bla
m
e $path: avoid getting fooled by case i
n
sensit
i
ve
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-17
Juni
o
C Hamano
G
i
t 1
.
7
.
1
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-17
Ju
n
io C H
a
mano
Merge
b
ranch
'
js
/
main
t
-fast-exp
o
rt-mark-err
o
r'
into
.
.
.
commit
|
commitdiff
|
tree
2012-06-03
J
unio
C Hamano
Git 1
.
7
.
1
0
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-03
J
unio C Hamano
Merge
branch 'ef/maint-rebase-error-messa
g
e' in
t
o maint
commit
|
commitdiff
|
tree
2012-06-01
Junio C Hamano
S
ta
r
t preparing for 1
.
7
.
1
0
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-01
Ju
n
i
o C Hamano
Merge branch 'ef/http-o-depends-on-gvf'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2012-06-01
Junio C Haman
o
Merge br
a
nch 'rs/maint-grep-F' in
t
o maint
commit
|
commitdiff
|
tree
2012-06-01
Junio C
Hama
n
o
Mer
g
e
branch 'jk/ident-split-fix'
into
maint
commit
|
commitdiff
|
tree
2012-06-01
Ju
n
io C Haman
o
Merge branch 'j
k
/
pretty
-
c
o
mmit-header-incomp
l
ete-line
.
.
.
commit
|
commitdiff
|
tree
2012-06-01
J
u
nio C
Hamano
Merge b
r
anch 'jk/forma
t
-person-part-bu
f
fer-limit' into
.
.
.
commit
|
commitdiff
|
tree
2012-06-01
J
u
nio C
Hamano
Me
r
ge
b
r
anch '
a
p/checkou
t
-no-progre
s
s-for-non-tt
y
'
.
.
.
commit
|
commitdiff
|
tree
2012-06-01
Junio C Hamano
Merg
e
branch 'maint' of g
i
t://github
.
c
o
m/git-l
1
0n/git
.
.
.
commit
|
commitdiff
|
tree
2012-05-25
J
u
nio C Hamano
Git 1
.
7
.
1
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-25
Junio C H
a
ma
n
o
Merge branch 'hv/submodul
e
-
alt-odb' into maint
commit
|
commitdiff
|
tree
2012-05-25
Ju
n
io C
Hamano
Merge branch 'b
p
/d
i
ff-no-index-strbuf-fix
'
i
nto
maint
commit
|
commitdiff
|
tree
2012-05-25
Junio C Hamano
U
p
da
t
e d
r
aft release
notes to 1
.
7
.
10
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-25
J
unio C H
a
ma
n
o
Me
r
ge bran
c
h 'jk/maint-status-porcelain-z
-
b' i
n
to maint
commit
|
commitdiff
|
tree
2012-05-14
Junio
C Ham
a
no
Mer
g
e br
a
nch 'mai
n
t
'
of
git://gi
t
h
u
b
.
com/git-l10
n
/git
.
.
.
commit
|
commitdiff
|
tree
2012-05-14
Juni
o
C Hamano
Start p
r
eparing
f
or 1
.
7
.
10
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-14
Junio C
H
a
mano
Merge
br
a
nch 'jk/maint-reflog-walk-count
-
vs-time'
i
nto
.
.
.
By Jeff King (4) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-05-14
Junio C
Hamano
Mer
g
e branch 'jk/doc-asciidoc-i
n
line-
l
i
teral' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-14
J
uni
o
C H
a
mano
Merge br
a
nch 'ef/
c
h
e
cko
u
t
-
empty' in
t
o
m
aint
commit
|
commitdiff
|
tree
2012-05-14
Ju
n
i
o C Hamano
Mer
g
e branch '
j
k/m
a
int-tformat
-
with-z
'
int
o
maint
By Jan Krüger (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-05-14
Junio C Ham
a
no
Merge
b
ranch 'js/check
o
u
t-detach-count' into m
a
in
t
commit
|
commitdiff
|
tree
2012-05-14
Junio
C Ha
m
a
n
o
Merge branch
'
ef/m
a
int-clone-progress-f
i
x' into maint
commit
|
commitdiff
|
tree
2012-05-11
Juni
o
C Hamano
Git 1
.
7
.
10
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-11
Junio
C Hamano
M
erge branch 'jc/di
f
f
-
a
l
go-clean
u
p' into m
a
int
commit
|
commitdiff
|
tree
2012-05-11
Junio C Hamano
Merge
b
ranch '
c
t/a
d
vise-p
u
sh-default
'
into
m
a
i
nt
commit
|
commitdiff
|
tree
2012-05-11
Junio C Ha
m
a
n
o
Merge branch
'
js/f
a
s
t-imp
o
rt-t
e
st
-
9300' into
m
aint
commit
|
commitdiff
|
tree
2012-05-11
Junio
C Hamano
Me
r
ge
b
ranc
h
'jk/r
e
pack-no-explode-objects-
f
rom-old
.
.
.
commit
|
commitdiff
|
tree
2012-05-11
J
u
nio C
H
amano
Merge branch 'ah/maint-gr
e
p-double-in
i
t
'
in
t
o maint
commit
|
commitdiff
|
tree
2012-05-11
J
unio C H
a
mano
Merge
bran
c
h 'fa/m
a
int-confi
g
-doc' in
t
o ma
i
n
t
commit
|
commitdiff
|
tree
2012-05-11
Junio C Hamano
Mer
g
e branch
'
rs/unp
a
c
k-tr
e
e
s-leakfix
'
in
t
o maint
commit
|
commitdiff
|
tree
2012-05-11
Junio C Hamano
Merge bra
n
ch 'sl/test-w
c
-
l-line-co
u
nt' into maint
commit
|
commitdiff
|
tree
2012-05-11
Juni
o
C Ha
m
ano
Merge branch '
r
l/show-empty-prefix' into maint
commit
|
commitdiff
|
tree
2012-05-10
Junio C Hamano
Upd
a
te dr
a
ft rel
e
a
se notes to 1
.
7
.
1
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-10
J
u
n
i
o
C
Hamano
M
e
rge bra
n
ch '
m
m/incl
u
de-userpath' into main
t
commit
|
commitdiff
|
tree
2012-05-10
Junio C Ham
a
no
Merg
e
b
r
anch
'cc/fi
x
-m
i
ssin
g
-va-end-in-revert' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-10
J
u
nio C Hamano
Merge branch
'bw/tes
t
-fix-grep-gnuism' i
n
to
maint
commit
|
commitdiff
|
tree
2012-05-10
Junio C H
a
mano
Merge branch 'jk/http-b
a
ckend-keep-committer
-
ide
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-05-10
J
uni
o
C
H
a
m
a
n
o
Merg
e
branch 'nl
/
rebase-i
-
cheat
-
she
e
t' into maint
commit
|
commitdiff
|
tree
2012-05-10
Junio C
Ha
m
ano
Merge branch 'bw/submodule-sed-solari
s
' into maint
commit
|
commitdiff
|
tree
2012-05-10
Junio C Hamano
Merg
e
branch
'jk
/
mai
n
t-push-progress' into
maint
commit
|
commitdiff
|
tree
2012-05-10
J
unio C Hamano
Merge br
a
nch 'jc/rerere-train' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2012-05-10
J
u
n
i
o C Hamano
Merge branch 'lp/diffstat-with-
g
r
a
ph' into ma
i
nt
commit
|
commitdiff
|
tree
2012-05-07
Junio C H
a
m
a
no
reflog-wal
k
: tel
l
explicit
--date
=
default
f
rom not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
Jun
i
o C Hamano
Start
p
reparing for
1
.
7
.
10
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
Junio C Ham
a
no
Merge b
r
an
c
h 'jk/m
a
i
nt
-
gitweb-te
s
t-use-sane-pe
r
l' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Juni
o
C Ha
m
a
no
Merge
b
ranch 'js/da
e
m
on-tes
t
-race-f
i
x
' into
m
aint
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Mer
g
e branch
'jk/maint-con
f
ig-bo
g
us-sectio
n
'
into maint
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
M
e
rge branch 'pw/t5800
-
import-race
-
fix' into maint
commit
|
commitdiff
|
tree
2012-05-07
J
unio C Ham
a
n
o
M
e
r
ge branch 'rt/c
h
erry-revert-conflict
-
su
m
mary' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Me
r
ge branch '
c
b/maint-re
p
ort
-
mou
n
t-point-correctl
y
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merge branch 'ef/maint-1
.
7
.
6-clo
n
e-progress-fix' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Ju
n
io C
Hamano
Merge bran
c
h 'jc
/
mer
g
e
-reduce-parents-earl
y
'
in
t
o maint
By
Junio C Hamano
(4) and Michał Kiedrowicz (1)
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
Merge b
r
anch
'cb/c
h
err
y
-pi
c
k-rev-pa
t
h-co
n
f
us
i
on' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Ju
n
io
C Hamano
Merge
b
r
a
nc
h
'cb/htt
p
-multi-cu
r
l-auth' int
o
maint
commit
|
commitdiff
|
tree
2012-05-03
Junio C
H
a
mano
Merge
b
ranch
'
m
b
/fetch
-
call-a-no
n
-branc
h
-a-ref' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
J
unio
C Haman
o
Merge br
a
nch
'rl/maint-s
t
ash-i18n-
s
ave-error' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Ju
n
io
C Hamano
M
erge branch
'
jm/m
a
int-str
n
cpy-diff-no-index'
i
nto
.
.
.
By Jim Meyering (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-05-02
Junio C
H
amano
Git
1
.
7
.
10
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
J
u
nio C
Ham
a
no
Merge branc
h
'pw/fast-import-datar
e
f
-
p
a
rs
i
ng' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o C Haman
o
Mer
g
e branch 'i
t
/
fetch-pack-many-r
e
fs' in
t
o maint
commit
|
commitdiff
|
tree
2012-05-02
Junio C
Hamano
Merge branch 'jl/maint-submod
u
le
-
recurse-f
e
tch
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
J
u
nio C Hamano
Me
r
ge
br
a
nch 'jc/maint-bl
a
m
e
-minimal' int
o
maint
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge
b
ranch 'lp/maint-diff-
t
hree-dash-with-graph'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branc
h
'jk/rebas
e
-i-submo
d
ule-c
o
nfl
i
ct
-
only'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C
Hamano
Merge branch 'main
t
'
o
f
h
t
tps
:
//gith
u
b
.
com/git-l
1
0
n
.
.
.
commit
|
commitdiff
|
tree
2012-05-01
Junio
C
Hamano
log-tree: the previo
u
s
o
n
e is st
i
ll
n
ot
quite right
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Junio C
H
a
m
a
n
o
contrib/rerere-train: use inst
a
l
led git
-
sh-setu
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-27
Junio C Hamano
Merge bran
c
h 'zj/mksh-c
o
lumns-brea
k
ag
e
' i
n
to lp/diffstat
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio C Ham
a
no
Start pre
p
aring for 1
.
7
.
10
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C
Ham
a
n
o
Merge bra
n
ch
'jk/ru
n
-command-eacces' into maint
commit
|
commitdiff
|
tree
2012-04-26
Junio
C
Hamano
Merge branch 'jc/push-upstream-san
i
t
y
' into maint
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Merge br
a
nch 'jc/maint-c
l
e
a
n-nested-workt
r
ee-i
n
-
s
ub
d
i
r
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Merge branch 'jk/
d
iff-no-ren
a
me-empty' i
n
to maint
commit
|
commitdiff
|
tree
2012-04-26
Ju
n
io C Hamano
Me
r
ge branch 'rs/combi
n
e-diff-ze
r
o-cont
e
xt-at
-
the-beginnin
g
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Jun
i
o C Hamano
Merge
bran
c
h
'jc/commi
t
-
u
nedit
e
d
-
t
em
p
l
ate' int
o
ma
i
n
t
By
Junio C Hamano
(4) and Adam Monsen (1)
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Merg
e
br
a
n
ch 'jk/a
d
d-p
-
skip-conflicts' into maint
commit
|
commitdiff
|
tree
2012-04-26
J
u
nio C
H
a
mano
Merge branch
'
jc/
c
om
m
it-hook-authorship' into maint
commit
|
commitdiff
|
tree
2012-04-26
Junio C Haman
o
Mer
g
e branch 'tr/m
a
int-word-diff-reg
e
x-sti
c
ky' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio
C
Hama
n
o
Merge branch 'jh/notes-merge-in-git-dir
-
worktree'
i
n
to
.
.
.
By Johan Herland (3) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-04-26
Junio C
H
amano
S
ync with
1
.
7
.
9
.
7
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Git 1
.
7
.
9
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio
C Ham
a
no
Sync
w
i
th 1
.
7
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
Junio C H
a
mano
Git 1
.
7
.
8
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio
C
Hamano
Sync with
1
.
7
.
7
.
7
commit
|
commitdiff
|
tree
2012-04-26
Junio
C Hamano
Git 1
.
7
.
7
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio
C
Ham
a
no
diff --n
o
-index: use strbuf
f
o
r temporary
p
athnames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-19
Junio C Hamano
t9400: fix gnu
i
sm in grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-19
Jun
i
o C Hamano
fmt-
m
erge-msg: discard needless mer
g
e pa
r
ents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
Jun
i
o C
H
a
m
a
no
b
u
i
ltin
/
merge
.
c:
r
educe
p
arent
s
earl
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
J
u
n
io C Hamano
builtin/merge
.
c: collect other parents
early
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
J
un
i
o
C Hama
n
o
bui
l
ti
n
/merge
.
c: remove
"
remoteheads" global variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-11
Juni
o
C Ham
a
no
bla
m
e: accept
-
-
n
eed-minimal
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
Junio C
H
aman
o
Merge b
r
anch 'maint-1
.
7
.
9
' i
n
to maint
commit
|
commitdiff
|
tree
2012-04-10
Ju
n
i
o
C Hama
n
o
Merge branch 'mai
n
t-1
.
7
.
8' into main
t
-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Me
r
ge
b
r
a
n
ch 'j
c
/maint-verify-objects-remove-pes
s
i
mism
.
.
.
commit
|
commitdiff
|
tree
next