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
Juni
o
C Hamano
blame: allow "blam
e
file" in the mid
d
le
o
f a conflicted
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-11
J
un
i
o C Hamano
bl
a
m
e
$p
a
th
:
avoid getting fooled
by
c
ase ins
e
nsi
t
i
v
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-17
Juni
o
C H
a
mano
G
i
t
1
.
7
.
10
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-17
Junio C Hamano
Merge branch 'js/main
t
-fast-export-
m
ark-error' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-06-03
J
un
i
o C H
a
mano
G
it 1
.
7
.
10
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-03
Junio C
Hamano
Merge b
r
anch '
e
f/mai
n
t-
r
ebase-e
r
ror-message
'
into maint
commit
|
commitdiff
|
tree
2012-06-01
J
unio C H
a
mano
Start prepari
n
g for
1
.
7
.
1
0
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-01
Jun
i
o C Hamano
Merge branch '
e
f/http-o-depends-on-gvf' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2012-06-01
Junio C Hamano
Merg
e
b
ranch 'rs/maint-grep-F' i
n
to maint
commit
|
commitdiff
|
tree
2012-06-01
Junio C Hamano
Merge
branch 'jk/
i
dent-spl
i
t-fix
'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2012-06-01
Juni
o
C Hamano
M
e
rge branch 'jk/pretty-
c
ommit-header-
i
ncomplete-line
.
.
.
commit
|
commitdiff
|
tree
2012-06-01
Juni
o
C H
a
mano
Merge br
a
nch 'jk/format-pers
o
n-part-buffer-li
m
it' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-06-01
Juni
o
C Hama
n
o
Merge branc
h
'ap/checkout
-
no-
p
ro
g
ress-fo
r
-non-tty'
.
.
.
commit
|
commitdiff
|
tree
2012-06-01
Ju
n
io C Hamano
M
e
rge branch 'maint'
of git://github
.
com/git-l10
n
/git
.
.
.
commit
|
commitdiff
|
tree
2012-05-25
Juni
o
C
Hamano
Git 1
.
7
.
1
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-25
Ju
n
io C Ha
m
ano
Merge
b
ranch '
h
v/submodule-al
t
-odb' into
m
aint
commit
|
commitdiff
|
tree
2012-05-25
Junio C Hamano
Merge
branch
'
bp/
d
i
ff-no-
i
ndex-strbu
f
-fix' in
t
o maint
commit
|
commitdiff
|
tree
2012-05-25
Junio C
H
a
m
ano
Update draf
t
release n
o
tes to 1
.
7
.
10
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-25
Junio
C
H
a
mano
Me
r
ge branch 'jk/maint-status-porcelai
n
-
z-b
'
into
m
ai
n
t
commit
|
commitdiff
|
tree
2012-05-14
Junio C
H
amano
Merge branch 'maint' of git://github
.
com/git-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2012-05-14
J
unio
C Ha
m
a
no
Start
prepa
r
ing for 1
.
7
.
10
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-14
Junio C Ham
a
no
Merge branch 'jk/maint-reflog-walk
-
count-
v
s-time' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-14
Junio C Hama
n
o
Mer
g
e branch 'jk/doc
-
as
c
iidoc-inlin
e
-literal' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-14
Junio C
H
amano
Merg
e
bran
c
h 'ef/checkout-empty'
into maint
commit
|
commitdiff
|
tree
2012-05-14
J
u
ni
o
C Hamano
Merge branc
h
'
jk/maint-tformat
-
wit
h
-z' into
m
a
int
commit
|
commitdiff
|
tree
2012-05-14
Junio C
H
amano
Merge branch 'js/checkout-detach-count' into
m
aint
commit
|
commitdiff
|
tree
2012-05-14
Junio C Hamano
Merge branch 'ef/maint-c
l
o
ne
-
progress-
f
i
x
' into maint
commit
|
commitdiff
|
tree
2012-05-11
Junio C Ha
m
ano
Gi
t
1
.
7
.
10
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-11
Junio C H
a
m
ano
Me
r
ge
b
ran
c
h '
j
c/diff-algo-c
l
eanup' into maint
commit
|
commitdiff
|
tree
2012-05-11
Juni
o
C Hamano
M
erge b
r
anch 'ct/advise-push-default' into maint
commit
|
commitdiff
|
tree
2012-05-11
J
u
n
i
o
C Hamano
Merge branch
'
js/
f
a
s
t-import-tes
t
-
9
300' into m
a
i
nt
commit
|
commitdiff
|
tree
2012-05-11
J
u
nio C Ha
m
ano
Merge
b
r
a
nch 'jk/r
e
pack-no-explode-objec
t
s-
f
rom-
o
ld
.
.
.
commit
|
commitdiff
|
tree
2012-05-11
Ju
n
io C Hamano
Merge branch 'ah/maint-grep-d
o
uble-init' into maint
commit
|
commitdiff
|
tree
2012-05-11
Junio C Hamano
Mer
g
e branch 'fa/m
a
int
-
con
f
ig-doc' into
maint
commit
|
commitdiff
|
tree
2012-05-11
Junio C
Hamano
Merge branch 'rs/unpack-trees-leakf
i
x' into m
a
int
commit
|
commitdiff
|
tree
2012-05-11
Junio C H
a
m
ano
Merge
branch 'sl
/
test-
w
c-l-line
-
c
o
unt'
into maint
commit
|
commitdiff
|
tree
2012-05-11
Junio C Hamano
Merge
b
ranc
h
'rl/show-e
m
pty-prefix'
i
n
t
o main
t
commit
|
commitdiff
|
tree
2012-05-10
Ju
n
io C Hamano
U
p
date draft r
e
l
ease not
e
s
to 1
.
7
.
10
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-10
Junio C
H
amano
Merge branch 'mm/inc
l
ud
e
-use
r
p
a
th' int
o
maint
commit
|
commitdiff
|
tree
2012-05-10
J
unio C Hamano
Merg
e
branch 'cc/f
i
x-
m
issi
n
g-va-end-in-revert' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-10
Junio C
H
amano
Merge
b
ranch 'bw/test-fix
-
gr
e
p-gnuism' into
m
aint
commit
|
commitdiff
|
tree
2012-05-10
J
un
i
o
C Haman
o
Me
r
g
e
branch 'jk/http-ba
c
ke
n
d-keep-co
m
mitter-
i
dent
.
.
.
commit
|
commitdiff
|
tree
2012-05-10
Juni
o
C Ham
a
no
Merge
b
ra
n
ch 'nl/rebase-i-cheat-shee
t
' into maint
commit
|
commitdiff
|
tree
2012-05-10
Junio C Hamano
Me
r
ge
b
ranch
'bw/
s
ub
m
o
d
ule-sed-solaris' into maint
commit
|
commitdiff
|
tree
2012-05-10
J
u
n
i
o C Haman
o
Merge
b
ranch 'jk/maint-push-progress
'
into ma
i
nt
commit
|
commitdiff
|
tree
2012-05-10
Junio C Hamano
Merg
e
branch
'jc/rerere-train' into maint
commit
|
commitdiff
|
tree
2012-05-10
Juni
o
C Ha
m
ano
Merge bra
n
ch 'lp/diff
s
ta
t
-w
i
t
h-graph' int
o
m
a
int
commit
|
commitdiff
|
tree
2012-05-07
Juni
o
C Haman
o
reflo
g
-walk:
t
ell exp
l
icit --date=
d
efa
u
lt
from not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-07
Junio
C
H
amano
Start prep
a
ri
n
g
for
1
.
7
.
10
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-07
J
u
n
i
o
C Hamano
Merge br
a
n
ch 'jk/m
a
int-gitweb-test-use-sane-
p
erl' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Junio
C
Hamano
M
e
rge
b
r
a
nch 'j
s
/
d
aemon-test-race-fix'
into maint
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hama
n
o
Merge branc
h
'jk/ma
i
nt-config-bogus-sect
i
on'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2012-05-07
Ju
n
i
o
C Hama
n
o
Me
r
ge
branch '
p
w/t58
0
0-
i
mp
o
r
t
-race-fix' i
n
to m
a
int
commit
|
commitdiff
|
tree
2012-05-07
Jun
i
o C Hamano
Merge
b
ra
n
ch 'r
t
/cherry-r
e
vert-conflict-
s
ummary'
int
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Junio
C Hamano
Merge b
r
a
nch 'cb/maint-rep
o
rt-mo
u
nt-point-cor
r
ectly
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Junio
C
Hamano
M
e
rge branch 'e
f
/maint-1
.
7
.
6-c
l
on
e
-pr
o
g
r
ess-
f
ix' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
Merge b
r
anch
'jc/merge-reduce
-
p
a
r
ents-early'
int
o
maint
commit
|
commitdiff
|
tree
2012-05-03
J
unio C Hamano
Merge bran
c
h 'cb
/
cherry-p
i
ck
-
rev-path-confusion' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Juni
o
C Ham
a
no
Merge bra
n
ch 'cb/http-m
u
lti-curl-auth'
into maint
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
Merge branch 'mb/fe
t
ch-
c
all-a
-
non-branch-a
-
ref' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
Merg
e
branch 'r
l
/maint-
s
t
a
sh-i18
n
-save-e
r
ror' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
Merge branch '
j
m/maint-strncpy-diff
-
no
-
index' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Git 1
.
7
.
10
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
J
u
nio C Hama
n
o
Me
r
ge bran
c
h 'pw/
f
ast-impo
r
t-datar
e
f-
p
ars
i
ng' int
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
J
u
nio C Hamano
Merge branch 'it/fetch-pack-
m
any
-
refs' int
o
maint
commit
|
commitdiff
|
tree
2012-05-02
Juni
o
C
Ha
m
an
o
Merge branch 'jl/maint-subm
o
d
u
le
-
recur
s
e-fetch' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch 'jc/maint-blame-min
i
mal' into ma
i
nt
commit
|
commitdiff
|
tree
2012-05-02
Junio C Ha
m
ano
Merge bra
n
ch 'lp/maint-di
f
f-three-dash-with-graph
'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Ham
a
no
Merge branch 'jk/reb
a
s
e-i-subm
o
d
u
le-confl
i
ct-only'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
Ha
m
ano
Merge branch 'maint'
o
f
h
tt
p
s://github
.
com/git-
l
10n
.
.
.
commit
|
commitdiff
|
tree
2012-05-01
Junio
C
Ha
m
ano
log-tree: the previou
s
one is still not quite
r
ight
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Junio C Ham
a
no
cont
r
ib
/
rer
e
re-train: use installed git-
s
h-setup
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-27
Ju
n
io C Hama
n
o
Me
r
ge bran
c
h
'zj/mksh-co
l
umns-bre
a
k
age' into
l
p/dif
f
sta
t
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Start prepari
n
g
for 1
.
7
.
10
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hama
n
o
M
erge branch 'jk/run-c
o
mmand
-
e
acces' into
m
a
int
commit
|
commitdiff
|
tree
2012-04-26
Junio C
H
amano
Merge branch
'
j
c/p
u
sh-upst
r
eam-sanity' into mai
n
t
commit
|
commitdiff
|
tree
2012-04-26
Junio C
Hamano
Merge b
r
anch 'jc/maint-c
l
e
a
n-ne
s
t
ed-wor
k
tree-in-
s
u
b
d
ir
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio
C H
a
mano
Me
r
ge branch
'jk/
d
i
ff
-
no-renam
e
-empty' into
maint
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Merge b
r
anch
'r
s
/combine-diff-zero-c
o
ntext-a
t
-
t
he-beginning
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Merge br
a
nch 'jc/commi
t
-unedited-template' into m
a
int
commit
|
commitdiff
|
tree
2012-04-26
J
unio C Hama
n
o
Merge bra
n
ch 'jk
/
add-p-skip-conflicts' into maint
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Merge
bra
n
ch
'
j
c/commit-hook-authorship' int
o
main
t
commit
|
commitdiff
|
tree
2012-04-26
Junio C Ha
m
a
n
o
M
e
rge branch 'tr/m
a
int-word-
d
iff-regex-
s
ticky' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Mer
g
e branch
'
jh/note
s
-merg
e
-in
-
git-dir-worktree'
into
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
J
u
nio C
Ham
a
no
Sync with 1
.
7
.
9
.
7
commit
|
commitdiff
|
tree
2012-04-26
J
u
ni
o
C Hamano
Git 1
.
7
.
9
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Juni
o
C
Hamano
Sync with 1
.
7
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
J
u
nio C
Hama
n
o
G
i
t 1
.
7
.
8
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
J
unio C Hamano
S
y
nc with 1
.
7
.
7
.
7
commit
|
commitdiff
|
tree
2012-04-26
Jun
i
o C Ham
a
n
o
G
i
t 1
.
7
.
7
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hama
n
o
diff
-
-no-inde
x
: use strbuf f
o
r temporary pathnam
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-19
Ju
n
i
o
C Hamano
t940
0
:
fix gnui
s
m
i
n gre
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-19
Junio C H
a
mano
fmt-mer
g
e
-msg: discard needless merge pa
r
ents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-18
Junio C Hamano
builtin/mer
g
e
.
c: reduce
p
arents earl
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-18
Junio
C
Hamano
builti
n
/merge
.
c
: c
o
llec
t
other
paren
t
s early
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-18
Junio C Ham
a
no
builtin/mer
g
e
.
c: remove "remoteheads" global variable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-11
Ju
n
io
C
Hamano
bla
m
e
: a
c
c
e
pt --need-mi
n
imal
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-10
Junio C Hamano
Merge br
a
nch 'maint-1
.
7
.
9' int
o
maint
commit
|
commitdiff
|
tree
2012-04-10
Junio C Ham
a
n
o
Merge
b
ranch 'maint-1
.
7
.
8
' into
maint-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-09
J
u
nio C Hama
n
o
Mer
g
e branch 'jc/maint-verify-o
b
jects-remove-pessimism
.
.
.
commit
|
commitdiff
|
tree
next