repo.or.cz
/
git
/
jnareb-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
bl
a
me
:
allow "blame file
"
in the
m
i
ddle o
f
a
conflicted
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-11
Junio C
H
am
a
no
blame $pat
h
: avoid getting fo
o
led
by case insensitive
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-17
Junio
C
Hamano
Git 1
.
7
.
1
0
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-17
Junio C
H
amano
Merge
b
ranch 'js/maint-fast-export-mark-error'
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
Junio C Hamano
Merge
b
ranch 'ef/maint-rebase-error-message'
into maint
commit
|
commitdiff
|
tree
2012-06-01
Junio C
H
am
a
no
Start preparing for 1
.
7
.
10
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-01
Juni
o
C Haman
o
Merge branch 'ef/
h
tt
p
-o-depends-on-gvf' into
maint
commit
|
commitdiff
|
tree
2012-06-01
J
unio C H
a
mano
Merge branch
'rs/ma
i
nt-grep-F' into maint
commit
|
commitdiff
|
tree
2012-06-01
Junio C Ha
m
ano
Merge branc
h
'jk
/
iden
t
-
split-fix' into maint
commit
|
commitdiff
|
tree
2012-06-01
Junio C Hamano
Merge br
a
nch
'
jk/pretty-commit-header-i
n
complete-line
.
.
.
commit
|
commitdiff
|
tree
2012-06-01
Juni
o
C Hamano
Merge branch 'jk/
f
ormat-person-part-buffe
r
-limit
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-06-01
Junio C H
a
mano
Merge
b
ranch
'
a
p/chec
k
out-
n
o
-
progress-for-non-tty'
.
.
.
commit
|
commitdiff
|
tree
2012-06-01
Junio
C
H
amano
Merge branch 'm
a
int' of
g
i
t:/
/
github
.
com/g
i
t-l10n/
g
it
.
.
.
commit
|
commitdiff
|
tree
2012-05-25
Junio C Ha
m
ano
Git 1
.
7
.
10
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-25
Junio C Ham
a
no
M
erge branch 'hv/subm
o
d
ule
-
alt-odb'
i
nt
o
maint
commit
|
commitdiff
|
tree
2012-05-25
J
unio C Hamano
Merg
e
branch 'bp/diff-no
-
index-strbuf
-
fix' into mai
n
t
commit
|
commitdiff
|
tree
2012-05-25
J
u
n
i
o
C Hamano
Update draft
release notes to 1
.
7
.
10
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-25
Junio C Hamano
M
e
rge bran
c
h
'jk/maint-statu
s
-porcelain-z-b' into ma
i
n
t
commit
|
commitdiff
|
tree
2012-05-14
Juni
o
C Hamano
Merge bra
n
ch 'maint' of git:/
/
github
.
c
o
m/git-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2012-05-14
Junio C Hamano
S
t
a
r
t
p
reparin
g
for 1
.
7
.
10
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-14
Junio C Haman
o
M
erge branch 'j
k
/
m
aint-
r
eflog-walk-
c
ount-vs-time
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-05-14
Junio C Hamano
Merge
b
ranch 'j
k
/do
c
-asciidoc-in
l
i
ne-literal' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-05-14
Junio C Hamano
Merge br
a
nch 'ef/c
h
eckout-
e
mpty' into maint
commit
|
commitdiff
|
tree
2012-05-14
Junio C Hama
n
o
Merg
e
b
ranch '
j
k/m
a
int-tf
o
rmat-with-z' int
o
maint
commit
|
commitdiff
|
tree
2012-05-14
Juni
o
C Hamano
Merge branch 'js
/
c
h
eckou
t
-detach-
c
oun
t
' into maint
commit
|
commitdiff
|
tree
2012-05-14
J
u
nio C Hamano
Merg
e
branch 'e
f
/maint
-
clone-pro
g
ress-f
i
x' into ma
i
nt
commit
|
commitdiff
|
tree
2012-05-11
Junio C Ha
m
ano
G
i
t 1
.
7
.
10
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-11
Junio C
H
amano
M
erge
branch 'jc/
d
if
f
-
algo-clea
n
up
'
into maint
commit
|
commitdiff
|
tree
2012-05-11
Junio C Hamano
Merge
bran
c
h 'ct/a
d
vise-p
u
s
h-def
a
ult'
int
o
maint
commit
|
commitdiff
|
tree
2012-05-11
J
unio
C
H
amano
Merge branch 'js/fa
s
t
-
i
mport-test-9300' into
maint
commit
|
commitdiff
|
tree
2012-05-11
Junio C
Hamano
Merge branch '
j
k/repack-n
o
-
e
x
plode-obj
e
ct
s
-from
-
o
l
d
.
.
.
commit
|
commitdiff
|
tree
2012-05-11
Ju
n
i
o
C Hamano
M
erge bran
c
h 'ah/mai
n
t-gr
e
p-
d
ouble-init' in
t
o maint
commit
|
commitdiff
|
tree
2012-05-11
J
u
n
io C H
a
mano
M
erge branc
h
'fa/main
t
-config-doc
'
int
o
maint
commit
|
commitdiff
|
tree
2012-05-11
Junio C Haman
o
Merge branch
'
rs/unpack-trees-le
a
kfix' i
n
to maint
commit
|
commitdiff
|
tree
2012-05-11
Junio C Ham
a
no
M
e
r
ge branch 'sl/t
e
st-
w
c-l-l
i
ne
-
count' into
maint
commit
|
commitdiff
|
tree
2012-05-11
Junio C Haman
o
Merge
b
r
anch 'rl/
s
how-
e
mpt
y
-
p
refix
'
into maint
commit
|
commitdiff
|
tree
2012-05-10
Junio C
H
amano
Update
draft release note
s
to 1
.
7
.
1
0
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-10
J
unio C
Hama
n
o
Merge
br
a
nch
'
mm/inc
l
ude-userpath'
into maint
commit
|
commitdiff
|
tree
2012-05-10
Junio C Hama
n
o
Merge branch 'cc/fix-mis
s
ing-va
-
e
nd-in-revert' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-10
Juni
o
C Hamano
Merge branch 'bw/t
e
st-fix
-
grep-gnui
s
m' into maint
commit
|
commitdiff
|
tree
2012-05-10
Juni
o
C Ham
a
n
o
M
e
rge branch 'jk/http
-
backend-keep-comm
i
tter-ident
.
.
.
commit
|
commitdiff
|
tree
2012-05-10
Jun
i
o C Hamano
Merg
e
b
r
an
c
h '
n
l/rebase-i-che
a
t-shee
t
' into
m
aint
commit
|
commitdiff
|
tree
2012-05-10
Junio C Hamano
Mer
g
e
branch
'
b
w/submodule-sed-solaris' into maint
commit
|
commitdiff
|
tree
2012-05-10
Junio C Hama
n
o
M
e
r
ge branch 'jk
/
main
t
-push-prog
r
e
ss' into maint
commit
|
commitdiff
|
tree
2012-05-10
Jun
i
o C Ham
a
n
o
Merge
branch 'jc/
r
erere
-
train' in
t
o maint
commit
|
commitdiff
|
tree
2012-05-10
Ju
n
i
o C
H
amano
M
e
rge branch 'lp/diffstat-
w
ith-graph'
into
m
aint
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
reflog-walk: tell
explicit --da
t
e=default from not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-07
J
unio C Hamano
S
tart preparing for 1
.
7
.
10
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-07
J
unio C
H
amano
Merge branch 'j
k
/maint
-
g
i
tweb-test-use-sane-perl' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Ju
n
io
C
Hamano
Merge br
a
nch
'
js/daemon
-
test
-
race
-
fix' int
o
maint
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hama
n
o
M
erg
e
branch 'jk/maint-config-b
o
gu
s
-section'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2012-05-07
Junio C
Ham
a
n
o
Merge br
a
nch 'pw/t5800-import-r
a
ce-fi
x
' into maint
commit
|
commitdiff
|
tree
2012-05-07
Juni
o
C Hamano
Merge b
r
anch 'rt/cherry
-
revert-conflic
t
-summa
r
y' int
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Ju
n
io C Hamano
Merge branch 'cb/m
a
int-r
e
port-mount-point-cor
r
e
ctly
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
J
u
n
io C Hamano
Merge branch 'ef
/
maint-1
.
7
.
6
-
clone-progress-fix' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
Merge
branch 'jc/merge-r
e
duce-p
a
rents
-
ear
l
y'
into main
t
commit
|
commitdiff
|
tree
2012-05-03
Junio
C Hamano
Merge branc
h
'cb/cherry
-
pick-rev-pat
h
-confusion' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C H
a
m
ano
Merg
e
b
ranc
h
'cb/
h
ttp-multi-curl-auth' into m
a
int
commit
|
commitdiff
|
tree
2012-05-03
Ju
n
io C Hamano
Merge branch 'mb/fetch-cal
l
-a-non-branch
-
a-ref' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
J
u
ni
o
C Hamano
Merge
branch 'rl/maint-stash-i18n-save-error' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
J
u
nio
C
H
amano
Mer
g
e br
a
nch
'
jm/maint-strncpy-di
f
f
-no-
i
ndex' 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 Ham
a
no
Merge
b
ranch 'pw/fast-import-dataref-p
a
r
sing
'
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Juni
o
C
Haman
o
M
erge branch
'it/fetc
h
-pack-many-
r
e
f
s' into maint
commit
|
commitdiff
|
tree
2012-05-02
Junio C Haman
o
Merge bran
c
h
'
jl/maint
-
submodule-recurse-fetch' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o C Haman
o
Merge branch 'jc/maint-blame-minimal' into maint
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io C Hamano
Merge
branch
'
l
p
/maint
-
diff-
t
hree-dash-with-gra
p
h'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Ha
m
ano
Merge bra
n
ch 'jk/rebase-
i
-submodule-con
f
lict
-
only'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o C Hamano
Merge branch '
m
aint' of https://githu
b
.
com
/
git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-05-01
Junio
C
Hamano
log
-
tree: the
p
revious one is still n
o
t
q
uit
e
right
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
J
unio C
H
a
m
a
n
o
contrib/rerere-
t
rain: use
i
n
stalled
g
it-sh-setup
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-27
Junio C Hama
n
o
Mer
g
e branch 'zj/mksh-columns-br
e
ak
a
ge' int
o
l
p/d
i
ffstat
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio C
H
amano
Start preparing
f
o
r
1
.
7
.
1
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Ha
m
a
n
o
Me
r
g
e
branch 'jk/run-command
-
eac
c
es'
into maint
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Merg
e
bran
c
h
'
jc/push-u
p
strea
m
-sanity' in
t
o maint
commit
|
commitdiff
|
tree
2012-04-26
J
un
i
o C Hamano
Merge branch 'jc/maint-clean-nest
e
d-worktr
e
e-in-sub
d
i
r
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio
C
Hamano
M
er
g
e branch 'jk/
d
iff-no-rename-empty
'
int
o
maint
commit
|
commitdiff
|
tree
2012-04-26
J
u
nio C Hamano
Merge b
r
anch
'
rs/combine-dif
f
-
z
ero
-
context-at-the-begin
n
i
n
g
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio C
Hamano
M
e
rge bra
n
ch 'jc/commit-unedited
-
templ
a
te' into maint
commit
|
commitdiff
|
tree
2012-04-26
Ju
n
io C Hamano
M
erge
b
r
a
nch 'jk/add-p-skip-conf
l
icts' into
maint
commit
|
commitdiff
|
tree
2012-04-26
Junio C Ha
m
ano
Merge
b
ranch '
j
c
/commit-hook-authorship' int
o
main
t
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Me
r
ge
b
ranch 'tr/maint
-
w
o
r
d-diff-regex-
s
ticky' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Merge
b
ranch 'jh/notes-merge-in-git-dir-worktree'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio C
H
amano
Sync with
1
.
7
.
9
.
7
commit
|
commitdiff
|
tree
2012-04-26
Junio C
Haman
o
Gi
t
1
.
7
.
9
.
7
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
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
Junio C
H
amano
Git
1
.
7
.
8
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Haman
o
Sync with 1
.
7
.
7
.
7
commit
|
commitdiff
|
tree
2012-04-26
Junio C
H
ama
n
o
Gi
t
1
.
7
.
7
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
d
iff
--no-index: use strbuf for te
m
porary pathnames
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
Junio C Hama
n
o
fmt-
m
erg
e
-msg: disca
r
d needle
s
s mer
g
e parents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-18
Junio C Hamano
builtin/merge
.
c: re
d
u
ce p
a
rents e
a
r
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-18
Ju
n
i
o
C
Haman
o
builtin/m
e
rge
.
c: collect o
t
her pa
r
ents early
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-18
J
unio C Hamano
builtin/mer
g
e
.
c: re
m
ove "remoteheads"
glo
b
al v
a
r
i
abl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-11
Junio C Hamano
blame: accept
--nee
d
-minimal
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-10
J
unio C Hamano
Merge branch '
m
aint-
1
.
7
.
9'
i
nt
o
main
t
commit
|
commitdiff
|
tree
2012-04-10
Junio C
H
ama
n
o
Merge br
a
nch
'maint-1
.
7
.
8' into maint-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-09
Jun
i
o
C
H
amano
Merge
branch 'jc/main
t
-verify-obje
c
ts
-
re
m
ove-pessimism
.
.
.
commit
|
commitdiff
|
tree
next