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
blame: allow "blame file" in the middle of a conflicted merge
2012-09-11
Junio C Hamano
blame
:
allow "bl
a
m
e
file" in the middle
o
f a confl
i
c
t
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hamano
blame $path
:
avoid getti
n
g fooled by cas
e
i
nsensiti
v
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-17
Junio C Hamano
Git 1
.
7
.
10
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-17
Juni
o
C
H
amano
Merg
e
branch
'js/maint-fast-export-mark-error
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-06-03
Junio
C Haman
o
Git 1
.
7
.
1
0
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-03
Junio C Ha
m
a
no
Merge branch 'ef/maint-rebase-error-me
s
sag
e
' into maint
commit
|
commitdiff
|
tree
2012-06-01
Junio C
Hamano
St
a
rt prepar
i
ng for 1
.
7
.
10
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-01
Junio C Hamano
Mer
g
e
branch
'
e
f
/http
-
o-depe
n
ds-on-gvf'
in
t
o maint
commit
|
commitdiff
|
tree
2012-06-01
Junio C Ha
m
a
no
Merge
b
ranch 'rs
/
maint
-
grep-F' into maint
commit
|
commitdiff
|
tree
2012-06-01
Junio
C
Ham
a
n
o
Merge branch 'jk/ident-split-fix' into maint
commit
|
commitdiff
|
tree
2012-06-01
Ju
n
io C Ham
a
n
o
Merge
b
ran
c
h 'jk/p
r
etty-commit-header-incomple
t
e-line
.
.
.
commit
|
commitdiff
|
tree
2012-06-01
Junio C Hamano
Mer
g
e
bran
c
h '
j
k
/f
o
rmat-per
s
on-part-buffer-limit'
into
.
.
.
commit
|
commitdiff
|
tree
2012-06-01
J
u
n
io C Ham
a
no
Merge branch 'a
p
/checkou
t
-no-progress-for-
n
on-tty'
.
.
.
commit
|
commitdiff
|
tree
2012-06-01
Junio C Hama
n
o
Merg
e
branch 'maint' of git
:
/
/
gi
t
hub
.
c
om
/
git-l
1
0n/git
.
.
.
commit
|
commitdiff
|
tree
2012-05-25
Junio
C Ham
a
no
Gi
t
1
.
7
.
10
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-25
Junio C Haman
o
Merge branch 'h
v
/submodu
l
e-alt-odb
'
into
ma
i
n
t
commit
|
commitdiff
|
tree
2012-05-25
Junio C Hamano
M
e
rge branch 'bp/diff-no-index
-
strbuf
-
fi
x
'
into m
a
int
commit
|
commitdiff
|
tree
2012-05-25
J
unio C Hamano
U
p
d
ate dr
a
ft release no
t
es to 1
.
7
.
10
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-25
Junio
C Hamano
Merge branch 'j
k
/maint-status-porcelain-z-b' in
t
o
m
aint
commit
|
commitdiff
|
tree
2012-05-14
Junio C
Hamano
Merge bran
c
h '
m
aint' of gi
t
://githu
b
.
com/g
i
t-l10n/
g
i
t
.
.
.
commit
|
commitdiff
|
tree
2012-05-14
Ju
n
io
C
H
ama
n
o
Star
t
preparing for 1
.
7
.
1
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-14
Junio C Ha
m
ano
Merg
e
branch 'jk/maint-reflog-walk-count-vs-ti
m
e
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-05-14
Ju
n
i
o
C
H
amano
Merge br
a
nch 'jk/d
o
c
-asci
i
doc-in
l
ine-
l
iteral' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-14
Junio C Ha
m
ano
Merge branch 'ef/
c
hec
k
ou
t
-empty
'
in
t
o
maint
commit
|
commitdiff
|
tree
2012-05-14
J
u
nio C Hamano
Merge bra
n
ch 'jk/maint-tformat-
w
it
h
-
z' into ma
i
nt
commit
|
commitdiff
|
tree
2012-05-14
J
u
nio C Hamano
M
erge branch
'js/ch
e
ckout-detach-count' into maint
commit
|
commitdiff
|
tree
2012-05-14
Junio C Hamano
Merge bra
n
ch 'ef/maint-c
l
one-pr
o
gres
s
-fix' into maint
commit
|
commitdiff
|
tree
2012-05-11
Junio 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
Merge branch 'jc/diff-algo
-
cleanup' into m
a
int
commit
|
commitdiff
|
tree
2012-05-11
Junio C Hamano
Merge branch
'
c
t/advise-push-def
a
ult' into mai
n
t
commit
|
commitdiff
|
tree
2012-05-11
Ju
n
i
o C Hamano
Merge branch 'js/fast-impo
r
t
-
test-9300'
into maint
commit
|
commitdiff
|
tree
2012-05-11
J
unio C Hamano
M
e
rge branc
h
'jk/repac
k
-no-
e
xplode-obj
e
c
ts-from-old
.
.
.
commit
|
commitdiff
|
tree
2012-05-11
Ju
n
io
C Hama
n
o
Merge
br
a
nch 'ah/maint-grep
-
double-in
i
t' into maint
commit
|
commitdiff
|
tree
2012-05-11
Junio C Hamano
Merge branch
'f
a
/m
a
int-
c
on
f
ig-doc' into maint
commit
|
commitdiff
|
tree
2012-05-11
Junio C Ham
a
n
o
Merge branch 'r
s
/u
n
pac
k
-
trees-le
a
kfix'
i
n
to maint
commit
|
commitdiff
|
tree
2012-05-11
J
un
i
o C Hamano
Merge
b
ranch 'sl/tes
t
-wc-l-l
i
ne-count'
i
nto maint
commit
|
commitdiff
|
tree
2012-05-11
Junio C
Haman
o
Merge br
a
n
c
h '
r
l/show-empty-prefix
'
into main
t
commit
|
commitdiff
|
tree
2012-05-10
Junio C Hamano
Update
d
raft
r
eleas
e
no
t
e
s
to 1
.
7
.
10
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-10
Junio C Ha
m
ano
Me
r
ge branch 'mm/includ
e
-userpath' into
m
aint
commit
|
commitdiff
|
tree
2012-05-10
Junio C Hamano
Merge bra
n
ch 'cc/fix-missin
g
-va-e
n
d
-in-revert'
into
.
.
.
commit
|
commitdiff
|
tree
2012-05-10
Junio
C
Hamano
Merge bra
n
c
h 'bw/test-fix-gr
e
p-gnuism' in
t
o maint
commit
|
commitdiff
|
tree
2012-05-10
J
u
nio C
Hamano
Merge
b
ranch 'jk/http-backen
d
-keep-committer-ident
.
.
.
commit
|
commitdiff
|
tree
2012-05-10
Junio C
H
amano
Merge branch 'nl/re
b
ase-i-cheat-sheet'
i
n
t
o
m
aint
commit
|
commitdiff
|
tree
2012-05-10
J
unio C Haman
o
Merge
branch 'bw
/
submodule-sed-solaris' into maint
commit
|
commitdiff
|
tree
2012-05-10
Jun
i
o C
H
aman
o
Merge
b
r
anch
'jk/maint
-
push-progres
s
' into maint
commit
|
commitdiff
|
tree
2012-05-10
J
u
n
io C Hamano
Merge bran
c
h 'jc/r
e
rere-train' into maint
commit
|
commitdiff
|
tree
2012-05-10
Junio C Ha
m
ano
Merge branch 'lp/diffstat-with-graph' int
o
m
aint
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
r
e
flog-wa
l
k: tell explicit --da
t
e=defaul
t
from not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-07
Junio
C
Hamano
S
t
art prepari
n
g for 1
.
7
.
1
0
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-07
Junio
C
H
am
a
no
Merge
br
a
nch
'
jk/maint
-
gitweb-tes
t
-use-sane-perl' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Junio C Haman
o
Merge b
r
anch 'js/daemon-
t
e
st-race-fi
x
' into ma
i
n
t
commit
|
commitdiff
|
tree
2012-05-07
Junio
C Hamano
Merge bra
n
ch 'jk/
m
a
i
n
t
-
config-bogus-sec
t
ion' into mai
n
t
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
M
e
rge branc
h
'pw/
t
5800-
i
m
p
ort-race-fix' into mai
n
t
commit
|
commitdiff
|
tree
2012-05-07
Junio C Ha
m
ano
Merge
b
ranch 'rt/ch
e
rry-revert-confli
c
t
-
summary' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Jun
i
o C Hamano
M
e
rge branch
'
cb/
m
aint-report-moun
t
-point-correctly
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Ju
n
i
o
C Hamano
M
erge branch 'ef/ma
i
nt-1
.
7
.
6
-clone-progress
-
fix
'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C
Ham
a
no
Merge bran
c
h 'jc/m
e
rge-reduce-parents-e
a
r
l
y
'
i
nto maint
commit
|
commitdiff
|
tree
2012-05-03
Ju
n
i
o
C
H
a
ma
n
o
M
er
g
e branch 'cb/cher
r
y-pick-rev-path
-
confus
i
o
n' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hama
n
o
Merge branch 'c
b
/http-
m
ulti-curl-auth' into maint
commit
|
commitdiff
|
tree
2012-05-03
Ju
n
i
o C Hamano
Merge b
r
a
nch
'
m
b/fetch-call-a-non-branch-a-
r
ef' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
J
u
n
i
o
C Hamano
M
e
rge
bran
c
h 'rl/main
t
-
s
ta
s
h-i18n
-
save-
e
rror' int
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio
C
Hamano
Merge branch 'jm/maint
-
strncpy-diff-no-index
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C
Hamano
Git 1
.
7
.
1
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Junio
C H
a
mano
Merge branch
'
p
w/fast-import-data
r
ef-parsing'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio
C Hamano
M
e
r
g
e
b
ranch 'it/fet
c
h
-p
a
ck-many-refs' into m
a
int
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
M
e
rge branch 'jl/ma
i
nt-submodule-rec
u
rse-fetch'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch 'j
c
/maint-b
l
a
m
e-minima
l
' into m
a
int
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o C Hamano
M
e
rge b
r
anc
h
'l
p
/maint-di
f
f-three-dash-wi
t
h-gra
p
h'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C H
a
mano
Merge branch '
j
k/r
e
base-i-
s
u
bmo
d
u
l
e-conflict-only'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch 'm
a
int' of https
:
//git
h
ub
.
co
m
/git-
l
1
0
n
.
.
.
commit
|
commitdiff
|
tree
2012-05-01
Juni
o
C
H
amano
l
o
g-tree:
the previous
one is stil
l
not quit
e
right
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
J
uni
o
C
Ham
a
n
o
contrib/r
e
rere-tr
a
i
n:
u
se ins
t
alled git-sh-se
t
u
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-27
J
u
nio C Ha
m
ano
Merge
b
r
anch 'zj/mksh-column
s
-breakage' into
lp/
d
i
ffstat
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
J
u
nio C Hama
n
o
Start
p
r
eparin
g
for 1
.
7
.
1
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Jun
i
o
C
Hamano
M
e
rge branch 'jk/run-
c
om
m
and-eacces'
i
n
to main
t
commit
|
commitdiff
|
tree
2012-04-26
Junio C
H
a
m
ano
Me
r
ge branch 'jc/push-upstream-sa
n
ity' into mai
n
t
commit
|
commitdiff
|
tree
2012-04-26
Jun
i
o C
H
amano
Merg
e
branch 'jc/ma
i
n
t
-clean-n
e
sted-worktree-in-s
u
bdir
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Juni
o
C Haman
o
Merge bran
c
h 'jk/d
i
ff-no-rename-
e
mp
t
y' into maint
commit
|
commitdiff
|
tree
2012-04-26
J
unio C Haman
o
Merge br
a
nch 'rs/comb
i
ne
-
diff-zero-
c
ontext-at-the-beginning
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio
C Haman
o
Merge
branch 'jc/commi
t
-un
e
dited-t
e
mplate' i
n
to m
a
int
commit
|
commitdiff
|
tree
2012-04-26
Junio C Ham
a
no
Mer
g
e b
r
anch 'jk/add-p-sk
i
p-conflic
t
s'
into maint
commit
|
commitdiff
|
tree
2012-04-26
Junio
C Hamano
Me
r
ge
b
ran
c
h
'
j
c
/c
o
m
m
it-hook-autho
r
s
h
ip' i
n
to maint
commit
|
commitdiff
|
tree
2012-04-26
Junio C H
a
mano
Merge branch 't
r
/main
t
-w
o
rd-diff-regex-sti
c
ky'
into
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio C Ham
a
no
Merge
b
r
a
nch 'jh/notes-mer
g
e-in-gi
t
-dir-worktre
e
' into
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
J
u
nio C Hamano
Sync wi
t
h
1
.
7
.
9
.
7
commit
|
commitdiff
|
tree
2012-04-26
Junio C H
a
mano
Git 1
.
7
.
9
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Sync w
i
th 1
.
7
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
Junio
C
Hamano
G
i
t
1
.
7
.
8
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Junio
C
H
ama
n
o
S
y
n
c
with 1
.
7
.
7
.
7
commit
|
commitdiff
|
tree
2012-04-26
Junio C H
a
mano
Git 1
.
7
.
7
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
J
unio C Hamano
di
f
f
-
-no-index: use str
b
u
f
for temporary
p
a
thn
a
mes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-19
Junio
C Ha
m
ano
t9400: fix gnu
i
sm in
g
rep
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-19
Ju
n
io C Hama
n
o
fmt-merge-msg:
d
iscard ne
e
dless merge paren
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-18
Juni
o
C
Hamano
builtin/merge
.
c: reduce parent
s
e
a
rly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-18
Junio C
Hamano
builtin/merg
e
.
c: coll
e
ct other parents early
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-18
Jun
i
o C Hamano
builtin
/
m
erge
.
c: re
m
o
ve "r
e
motehe
a
ds
"
glob
a
l variabl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-11
J
unio C Ha
m
ano
blame:
accept --n
e
ed-minima
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-10
Jun
i
o C
H
a
mano
Merge
b
ranch 'main
t
-1
.
7
.
9' int
o
maint
commit
|
commitdiff
|
tree
2012-04-10
Junio
C
Hamano
Merge branch 'maint-1
.
7
.
8' into
maint-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-09
Junio C Haman
o
Merge branch
'jc/m
a
int-v
e
r
ify-objects-r
e
move-pessimi
s
m
.
.
.
commit
|
commitdiff
|
tree
next