repo.or.cz
/
git
/
mingw
/
j6t.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:
all
o
w "blame file
"
in
the middle of
a conflicted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-11
J
unio C H
a
man
o
blam
e
$
path: avoid
getting fooled by case
inse
n
si
t
i
v
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-17
Junio C Hama
n
o
Git 1
.
7
.
10
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-17
Junio C
Hamano
M
erge
b
ranch
'js/maint-fas
t
-ex
p
or
t
-
mark-error' into
.
.
.
commit
|
commitdiff
|
tree
2012-06-03
Junio C Hamano
G
i
t
1
.
7
.
10
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-03
Junio C H
a
mano
M
erg
e
branch '
e
f/main
t
-rebase-erro
r
-
m
es
s
a
g
e' into maint
commit
|
commitdiff
|
tree
2012-06-01
Junio C Hamano
S
t
art
p
reparing f
o
r 1
.
7
.
10
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-01
Jun
i
o
C
H
a
mano
Merge branch '
e
f/htt
p
-
o
-
depends-
o
n-gv
f
' into maint
commit
|
commitdiff
|
tree
2012-06-01
Junio
C Ham
a
no
Merge branch
'rs/main
t
-grep-
F
' into maint
commit
|
commitdiff
|
tree
2012-06-01
Junio C Hamano
Merge branc
h
'jk/ident-split-
f
ix
'
into maint
commit
|
commitdiff
|
tree
2012-06-01
Junio C Haman
o
Merge branch 'j
k
/pr
e
tty-commi
t
-hea
d
er-i
n
complete-line
.
.
.
commit
|
commitdiff
|
tree
2012-06-01
Jun
i
o
C Hamano
Merge branch '
j
k/forma
t
-
person-part-bu
f
fer-l
i
mi
t
' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-06-01
J
unio C Hamano
Merge br
a
nch 'ap/checkout-no-progress-for-non-tty
'
.
.
.
commit
|
commitdiff
|
tree
2012-06-01
Junio C Ha
m
a
n
o
M
erge bra
n
ch 'm
a
int' of git://g
i
thub
.
c
o
m/git-l10n/gi
t
.
.
.
commit
|
commitdiff
|
tree
2012-05-25
Junio C
H
a
m
ano
Git
1
.
7
.
1
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-25
Juni
o
C
Hamano
Merge
b
r
a
n
ch 'hv
/
sub
m
o
du
l
e
-alt-odb' into main
t
commit
|
commitdiff
|
tree
2012-05-25
Junio C Hamano
Merge
branch 'bp/diff
-
n
o
-in
d
ex-strbuf-fix
'
into maint
commit
|
commitdiff
|
tree
2012-05-25
J
unio C Haman
o
Update draft release no
t
es to 1
.
7
.
1
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-25
Junio C Hamano
Merge
br
a
nch 'jk/m
a
i
nt-status-porcelain
-
z-
b
' into
m
aint
commit
|
commitdiff
|
tree
2012-05-14
Junio
C
Hamano
Mer
g
e branch
'maint' of
git:/
/
github
.
com/git-l1
0
n
/gi
t
.
.
.
commit
|
commitdiff
|
tree
2012-05-14
Junio C Ham
a
no
Start
p
repa
r
i
ng
f
or 1
.
7
.
1
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-14
Junio C
H
amano
Merge b
r
anch 'j
k
/
maint-r
e
f
log
-
wa
l
k-count-vs-time' into
.
.
.
By Jeff King (4) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-05-14
Ju
n
io C Ham
a
no
Merge branch 'jk/doc-asciid
o
c
-
i
n
line-l
i
ter
a
l' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-14
Junio C Hamano
Merge branch
'ef
/
checkout-empty' int
o
maint
commit
|
commitdiff
|
tree
2012-05-14
Junio C Ha
m
ano
Mer
g
e bra
n
ch
'jk
/
ma
i
nt-tfo
r
mat-with-z' into maint
By Jan Krüger (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-05-14
Junio
C
H
amano
Mer
g
e branch
'js/che
c
k
out-detac
h
-count'
into
m
aint
commit
|
commitdiff
|
tree
2012-05-14
Junio C Hamano
Merge
branch 'ef
/
maint-clon
e
-pr
o
gress-f
i
x' 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
Mer
g
e branc
h
'
j
c/diff-al
g
o-cleanup' into mai
n
t
commit
|
commitdiff
|
tree
2012-05-11
Jun
i
o C Hamano
Merg
e
branch 'c
t
/advise-
p
us
h
-defau
l
t' in
t
o
maint
commit
|
commitdiff
|
tree
2012-05-11
Junio
C H
a
mano
Me
r
ge
branch 'js/fast-import-
t
est-9300' into
m
aint
commit
|
commitdiff
|
tree
2012-05-11
Jun
i
o C Hamano
Mer
g
e branch 'jk/r
e
pack-no-explode-objec
t
s-from-old
.
.
.
commit
|
commitdiff
|
tree
2012-05-11
Junio C Haman
o
M
erge branch
'
ah/mai
n
t-grep-do
u
bl
e
-init
'
into maint
commit
|
commitdiff
|
tree
2012-05-11
Junio
C
Hamano
Merge branch 'fa/maint-config-doc'
i
nto maint
commit
|
commitdiff
|
tree
2012-05-11
Junio C Hama
n
o
M
e
rge branch 'rs
/
u
n
pack-t
r
ees-leakfix' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2012-05-11
Junio
C Hamano
Merge bran
c
h 'sl/te
s
t-wc-l-line-count' into maint
commit
|
commitdiff
|
tree
2012-05-11
Ju
n
io C Hama
n
o
M
erge branch 'rl/show-
e
mpty-pref
i
x' into
main
t
commit
|
commitdiff
|
tree
2012-05-10
Junio C Ham
a
no
U
p
date draft
r
e
lease no
t
es to 1
.
7
.
10
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-10
Junio C Ham
a
no
Merge branch 'mm/include-userpath
'
into m
a
int
commit
|
commitdiff
|
tree
2012-05-10
Junio C
H
a
m
a
no
Merge
bran
c
h 'cc/fix-mis
s
ing-
v
a-end-in-revert'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2012-05-10
Junio
C
Ham
a
no
Me
r
ge branch 'bw/test-f
i
x-grep-g
n
uism' i
n
to m
a
int
commit
|
commitdiff
|
tree
2012-05-10
Junio C Hamano
Merge br
a
nch 'jk/http-
b
ackend-keep
-
c
ommitt
e
r-i
d
ent
.
.
.
commit
|
commitdiff
|
tree
2012-05-10
Junio C
H
a
mano
Merg
e
br
a
nc
h
'n
l
/rebase-i-cheat-sheet' into m
a
int
commit
|
commitdiff
|
tree
2012-05-10
J
u
nio C
Hamano
Merge branch '
b
w/submodul
e
-
sed-solar
i
s
' into
m
aint
commit
|
commitdiff
|
tree
2012-05-10
Junio C Hamano
Merge branch 'jk/maint-push-pro
g
ress' in
t
o main
t
commit
|
commitdiff
|
tree
2012-05-10
Junio C
Haman
o
Merge branc
h
'j
c
/re
r
ere-trai
n
'
into
m
ai
n
t
commit
|
commitdiff
|
tree
2012-05-10
Junio C Hamano
M
erge br
a
nch '
l
p
/
d
i
ffsta
t
-with
-
graph' in
t
o maint
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
reflog-walk
:
tell
e
xplicit
--da
t
e=default from not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
Junio C H
a
mano
Start pre
p
arin
g
f
o
r 1
.
7
.
10
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
Ju
n
i
o
C Ha
m
ano
Merge branch 'jk/maint-
g
itweb-test-use-sa
n
e-per
l
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merg
e
bran
c
h '
j
s
/
d
aemon-test-r
a
ce-fix' into main
t
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merge branch
'jk/maint-con
f
ig-bogus-section' into maint
commit
|
commitdiff
|
tree
2012-05-07
Junio C Haman
o
M
e
rge br
a
nch 'pw/t5800-impo
r
t-rac
e
-fix' into maint
commit
|
commitdiff
|
tree
2012-05-07
J
u
nio C Hama
n
o
Me
r
ge branch 'rt/cherry-
r
eve
r
t-c
o
nflict
-
summa
r
y
' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merge branch
'
cb/maint-report-mount-
p
o
i
nt-correctl
y
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merge branch 'e
f
/m
a
int-1
.
7
.
6
-
clone-
p
rogress
-
f
i
x' int
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C
Hamano
Merge branc
h
'jc/m
e
rge-reduce-parents-early
'
in
t
o ma
i
nt
By
Junio C Hamano
(4) and Michał Kiedrowicz (1)
commit
|
commitdiff
|
tree
2012-05-03
Junio C
H
amano
Merge branch '
c
b/cherry-pick-rev-path-conf
u
sion' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C
Hamano
Merge bran
c
h
'
cb/
h
ttp-mu
l
ti-cur
l
-aut
h
' into
maint
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
Merge branch 'mb/fetch-
c
al
l
-a-non-branch-a
-
ref
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Ju
n
io C
Ham
a
no
Merge branch 'rl/ma
i
nt-stash-i18n-save-error' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Juni
o
C Hamano
M
erge bra
n
ch 'jm/maint-st
r
ncpy-dif
f
-no-i
n
dex'
i
n
to
.
.
.
By Jim Meyering (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io C Hamano
Git 1
.
7
.
10
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
M
e
rge
branch
'
p
w/fast-
i
mport-da
t
aref-parsing' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C
H
amano
Mer
g
e b
r
anch 'it/fetch-pack
-
many-
r
efs' into
maint
commit
|
commitdiff
|
tree
2012-05-02
Juni
o
C
Hamano
Merge branch 'jl
/
maint-
s
ubmo
d
ul
e
-recu
r
se-fetch' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Ha
m
ano
Merge branch '
j
c/maint-
b
lame-mi
n
ima
l
'
into maint
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch
'lp/maint-di
f
f-thr
e
e-dash
-
with-gr
a
ph'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
J
u
nio C H
a
mano
M
e
r
g
e branch 'jk/rebase-
i
-submodul
e
-conf
l
i
c
t-only'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hama
n
o
M
e
rge b
r
anch 'mai
n
t'
o
f https
:
//github
.
com/
g
it-l10
n
.
.
.
commit
|
commitdiff
|
tree
2012-05-01
Junio
C
Hamano
log-t
r
ee: the previ
o
us one is still not q
u
ite right
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
J
unio C H
a
mano
contri
b
/rer
e
re-tr
a
i
n:
u
se
i
n
s
t
a
lled
git-sh
-
setup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-27
Junio C Ham
a
no
Merge branch 'zj/mksh-columns-breakage' into lp/dif
f
s
t
at
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
J
u
nio C H
a
mano
Start preparing for 1
.
7
.
10
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio
C
H
amano
Merg
e
bra
n
ch 'jk/
r
un-com
m
a
n
d
-
e
a
c
ces'
i
nto maint
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hama
n
o
M
erge br
a
nch 'jc
/
push-upstream-sanit
y
' in
t
o m
a
int
commit
|
commitdiff
|
tree
2012-04-26
Junio C Ha
m
a
no
M
erge
br
a
nch 'jc/
m
aint-cle
a
n-nested-wo
r
ktr
e
e
-in-subdir
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
J
u
nio C Hama
n
o
Merge branc
h
'jk/diff-n
o
-rename-
e
mpty' into maint
commit
|
commitdiff
|
tree
2012-04-26
J
u
n
io C Hama
n
o
Merge bra
n
ch 'rs/
c
ombine-diff-zero-context-at-the
-
be
g
inning
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Me
r
ge bra
n
ch 'jc/commit-une
d
ited-tem
p
late
'
into maint
By
Junio C Hamano
(4) and Adam Monsen (1)
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Me
r
g
e
branch '
j
k
/
add-p-skip-con
f
licts' into maint
commit
|
commitdiff
|
tree
2012-04-26
Junio
C
Haman
o
Merge br
a
nch 'jc/
c
ommit-hoo
k
-autho
r
ship
'
i
nt
o
m
aint
commit
|
commitdiff
|
tree
2012-04-26
Junio C Ham
a
no
Merge b
r
anch
'tr/maint
-
word-diff-re
g
ex-s
t
ick
y
' into
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hama
n
o
Merge branch 'jh/notes-merge-i
n
-g
i
t-dir-worktree'
into
.
.
.
By Johan Herland (3) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-04-26
Junio
C
H
a
mano
S
ync
w
ith
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
J
unio C Hamano
Syn
c
w
ith 1
.
7
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
Jun
i
o
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
a
mano
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 Hama
n
o
diff --
n
o-
i
ndex: u
s
e
strbuf for t
e
m
p
o
rary path
n
ames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-19
Junio C H
a
mano
t9400: fix gnui
s
m in grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-19
Juni
o
C Hamano
f
mt-merge-msg: disc
a
rd
n
eedless merge p
a
r
e
nt
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
Junio C
H
ama
n
o
builtin
/
merge
.
c: reduce pare
n
ts early
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
Junio C Hamano
b
uiltin/merg
e
.
c: collect other parents early
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
Junio C
H
amano
builtin
/
merge
.
c
:
remo
v
e "remotehe
a
ds" global variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-11
Junio C Hamano
blame: accept --ne
e
d
-m
i
n
i
mal
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' in
t
o
m
aint
commit
|
commitdiff
|
tree
2012-04-10
Ju
n
i
o C Hamano
M
e
rge branch
'maint-1
.
7
.
8' into maint-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-09
Juni
o
C Haman
o
M
erge bra
n
ch 'jc/maint-verif
y
-objects-re
m
ove-pessi
m
ism
.
.
.
commit
|
commitdiff
|
tree
next