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
merge: teach -Xours/-Xtheirs to binary ll-merge driver
2012-09-09
Junio C Hamano
merge: t
e
a
ch -Xours
/
-Xth
e
irs to
binary ll-merge driv
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
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
n
o
Sync with 1
.
7
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
G
it 1
.
7
.
8
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
J
u
nio C Ha
m
ano
Sync with 1
.
7
.
7
.
7
commit
|
commitdiff
|
tree
2012-04-26
Junio C Haman
o
Git 1
.
7
.
7
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
Junio C Hamano
Merge bran
c
h
'
m
a
int-1
.
7
.
8' into maint-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hama
n
o
Merge branch 'jc
/
maint-verify-
o
b
j
e
c
ts-
r
emove-pes
s
i
m
i
sm
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Ha
m
a
n
o
Merge branch 'dw/g
i
tweb-doc-
g
rammo
'
i
n
to maint
-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C
H
amano
Me
r
ge branch 'tr/cach
e
-tree' into ma
i
nt-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
J
unio C
H
a
m
a
no
Merge
b
ranch
'cb/maint-t5541-make-serv
e
r
-p
o
rt-po
r
table
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C H
a
mano
Merge branch
'c
n
/maint-r
e
v-li
s
t-
d
oc' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
J
u
nio
C
H
a
mano
Merge bran
c
h '
t
r/mai
n
t-bu
n
d
l
e-boun
d
ary' into main
t
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge b
r
anc
h
'tr/
m
aint-bundle-lo
n
g-subjec
t
' int
o
maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio
C Hamano
Merg
e
b
r
anch 'ph/rerere-doc' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-02
Ju
n
io C Ham
a
no
Git 1
.
7
.
9
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Ju
n
io
C
Hamano
Mer
g
e branc
h
'jc/maint
-
merge-a
u
toe
d
it' int
o
m
ain
t
commit
|
commitdiff
|
tree
2012-03-26
Junio
C
H
amano
Git 1
.
7
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
Me
r
g
e
branch 'jn/maint-fas
t
-import-empty-ls' into m
a
int
commit
|
commitdiff
|
tree
2012-03-26
Junio C Ha
m
ano
Merge branch 'ph/
r
er
e
re-doc' into maint
commit
|
commitdiff
|
tree
2012-03-26
J
u
nio C Hamano
Merge br
a
nch 'ms
/
maint-
c
on
f
ig-error-at-eol-linecount
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Junio
C Hamano
Merge
bra
n
c
h
'ma
i
nt-1
.
7
.
8
'
into main
t
commit
|
commitdiff
|
tree
2012-03-20
Junio C
H
a
mano
merge: backport
G
IT_MERGE_AUTOEDIT support
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-20
Junio C Ham
a
no
Merg
e
branc
h
'
ks/sor
t
-wildcard-in-makefil
e
' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Junio C
H
amano
Mer
g
e bra
n
c
h 'jc/ad
v
ise-i18n' into main
t
-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
Junio
C
H
a
mano
Mer
g
e
b
r
a
n
ch 'jn/gitweb-uns
p
ecifie
d
-action' in
t
o maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-15
J
u
nio C Hamano
fetch/receive: remove over
-
pessim
i
stic conn
e
c
t
ivity
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
Git 1
.
7
.
9
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
J
unio C Hama
n
o
Merg
e
bra
n
ch
'tr/maint-bundle-boundary' into maint
commit
|
commitdiff
|
tree
2012-03-12
J
unio C Hamano
M
erge b
r
anch 'jc/
m
ain
t
-diff-patch-
h
eader' into maint
By
Junio C Hamano
commit
|
commitdiff
|
tree
2012-03-12
Junio C
Haman
o
Merge
bran
c
h
'jn
/
maint-do-not-m
a
tch-with-unsanitized
.
.
.
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hama
n
o
Merge branc
h
'jc/
a
m-3-nonstandard-popt
'
into
ma
i
nt
commit
|
commitdiff
|
tree
2012-03-06
Jun
i
o C Hamano
Merge branch
'mai
n
t
-
1
.
7
.
8' into
maint
commit
|
commitdiff
|
tree
2012-03-06
Junio C Hamano
Merge
b
r
a
nch 'maint-1
.
7
.
7'
i
nto maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-05
Junio C
H
amano
Git
1
.
7
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
J
u
nio C Haman
o
M
erge branch 'jc/d
o
c
-
merg
e
-o
p
t
ions' into
m
a
int
commit
|
commitdiff
|
tree
2012-03-05
Junio
C Hama
n
o
Merge branch
'cn/
m
aint-rev-list-doc' i
n
to maint
commit
|
commitdiff
|
tree
2012-03-05
Junio
C
Hamano
Update dr
a
ft releas
e
notes to 1
.
7
.
9
.
3 for the las
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Junio C Haman
o
Merge branch
'cn/maint-branch
-
w
i
th
-
bad' i
n
to
m
a
int
commit
|
commitdiff
|
tree
2012-03-05
J
unio C Ha
m
ano
Merge branch
'
jn/ma
i
nt
-
gitweb-inv
a
lid-
r
egexp' into
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Juni
o
C Hamano
Merge
bra
n
ch 'nd/main
t
-v
e
rify-o
b
j
e
c
ts'
i
n
to maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Me
r
ge bran
c
h 'j
k
/maint-avoi
d
-
s
treamin
g
-filtered
-
co
n
tents
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
M
e
rge branch 'j
b
/fi
l
ter-ignor
e
-sigpipe' into maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Merge
b
ranc
h
'sp/smart-http-failure-t
o
-pus
h
' into maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Me
r
ge branch
'
tr/maint-b
u
nd
l
e-l
o
ng-sub
j
e
c
t' into maint
commit
|
commitdiff
|
tree
2012-03-02
Junio
C Hamano
Doc
u
mentation: do not assu
m
e that n > 1 in
<rev>~$n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Junio C Hamano
diff -p: sque
l
ch "di
f
f
--git" he
a
d
e
r for stat-dirty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Junio C H
a
mano
t
4011: il
l
us
t
rate "diff-index -p"
o
n stat-dirty p
a
ths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Junio
C
Hamano
t
401
1
: modernise st
y
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio
C
Hamano
Update
d
r
af
t
release notes to 1
.
7
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
J
u
nio C Ha
m
ano
Merge branch 'pj/remote-set
-
b
r
anc
h
es-usage-fix'
into
.
.
.
commit
|
commitdiff
|
tree
2012-02-27
Juni
o
C H
a
mano
Merge
b
ranch 'jn
/
gitweb-
u
nbor
n
-he
a
d' into maint
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Merge branch 'jn/ancient-meld-support' into maint
commit
|
commitdiff
|
tree
2012-02-27
J
unio C
H
amano
M
e
rge bran
c
h 'tr/merge-edit-gui
d
anc
e
' into ma
i
n
t
commit
|
commitdiff
|
tree
2012-02-27
J
uni
o
C H
a
ma
n
o
t
est
:
"am -3" can accept
no
n
-
s
t
a
n
d
a
rd -p
<
num>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Juni
o
C Haman
o
D
ocument accumulated fixes since 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio C
H
a
m
ano
Merge branch 'jc/add-re
f
resh-unm
e
rged' into maint
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Mer
g
e branch 'js/con
f
igure-lib
i
ntl' i
n
to maint
commit
|
commitdiff
|
tree
2012-02-27
J
u
n
io C Hama
n
o
Sync with 1
.
7
.
8
.
5
commit
|
commitdiff
|
tree
2012-02-27
Jun
i
o C Hamano
G
it
1
.
7
.
8
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-23
Junio C H
a
mano
Document m
e
rge
.
branchdesc confi
g
ura
t
ion vari
a
b
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-23
Junio C Hamano
am -3: al
l
ow no
n
standard -p
<
num> op
t
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-23
Junio
C
Hamano
Git 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-22
Junio
C H
a
mano
D
o
cument
a
tion/m
e
rge-o
p
tio
n
s
.
t
x
t: group "ff" related
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-21
Junio C
H
amano
U
p
date draft rel
e
ase n
o
tes to 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hama
n
o
Merge branch
'cb/recei
v
e-pack-keep-
e
rror
s
' into maint
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
Merge
b
ranch 'cb
/
transfer-no-pro
g
re
s
s' into m
a
int
commit
|
commitdiff
|
tree
2012-02-21
J
unio C Hamano
Mer
g
e
b
ranch
'jk/git-dir-lookup' into main
t
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
Mer
g
e branch 'jc/diff-stat-scaler' into maint
commit
|
commitdiff
|
tree
2012-02-21
Junio C
Hamano
Mer
g
e branch 'zj
/
ter
m
-co
l
umns' into maint
commit
|
commitdiff
|
tree
2012-02-21
J
uni
o
C Hamano
Merge
b
ranch 'c
b
/m
a
int-rev-list-verify-obje
c
t
' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
Merge b
r
anch 'cb/maint-
t
5541-make-serv
e
r-p
o
rt-portable
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
Mer
g
e
branch 'dp/i18n-l
i
b
char
s
et'
into maint
commit
|
commitdiff
|
tree
2012-02-21
Junio
C
Hamano
Me
r
ge branch
'
j
k/gr
e
p-bi
n
a
r
y-
a
ttribute' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2012-02-21
Junio C
Hamano
M
erge branch 'nd/d
i
f
f
sta
t
-gramnum'
i
nto maint
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
Merge branch 'nd/find-pack-en
t
ry-recent
-
cache-invalidation
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
Junio C
H
amano
M
e
rg
e
b
ranch 'tt/profile-buil
d
-fix'
i
nto maint
commit
|
commitdiff
|
tree
2012-02-21
Jun
i
o C Hamano
Merge bran
c
h '
f
c
/
zsh-completion'
into main
t
commit
|
commitdiff
|
tree
2012-02-20
Junio
C Haman
o
Upda
t
e draft release notes to 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-17
Junio C Hamano
refresh_inde
x
: do not sh
o
w
u
n
m
erged
p
ath that
i
s out
s
ide
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-16
Junio C Hamano
Update draf
t
release
notes to 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-16
Junio
C
Hamano
Merge branch 'jc/check
o
ut-out-of-u
n
born' into
m
a
i
nt
commit
|
commitdiff
|
tree
2012-02-16
Ju
n
io C Hamano
Mer
g
e branch 'jc/maint-m
a
ilma
p
-ou
t
put' into maint
commit
|
commitdiff
|
tree
2012-02-16
Juni
o
C Haman
o
Me
r
g
e branch 'jk/promp
t
-f
a
llb
a
c
k
-to-tty
'
i
n
to
maint
commit
|
commitdiff
|
tree
2012-02-16
Junio
C
Hamano
Merge branch 'jn/gitweb-search-ut
f
-8' into
maint
commit
|
commitdiff
|
tree
2012-02-16
Junio
C
Ha
m
ano
Mer
g
e
b
ran
c
h 'jc/
m
aint-
c
ommit-i
g
nor
e
-i-t-a
'
into
m
aint
commit
|
commitdiff
|
tree
2012-02-16
Junio C Haman
o
M
e
r
g
e bra
n
ch 'mm/em
p
ty-loose-erro
r
-messa
g
e' into
m
aint
commit
|
commitdiff
|
tree
2012-02-16
Junio C Hamano
Mer
g
e branch
'n
k
/ctype-for-perf
'
in
t
o maint
commit
|
commitdiff
|
tree
2012-02-16
Junio C
Ham
a
n
o
Me
r
g
e branch '
j
x/i
1
8n-more-ma
r
king
'
into maint
commit
|
commitdiff
|
tree
2012-02-16
Junio C Ham
a
n
o
Merge branch 'r
t
/
c
om
p
l
etion-branch-edit-desc'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2012-02-14
Ju
n
i
o C
H
amano
diff
-
-stat:
show
bars of same length for paths
w
ith
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-14
J
u
nio C Hamano
Gi
t
1
.
7
.
9
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-14
Junio C Hamano
Merge
branch 'jk/maint-ta
g
-
s
ho
w
-fix
e
s' into m
a
int
commit
|
commitdiff
|
tree
2012-02-14
Junio
C Hamano
Merge
branch
'bw/inet-pton-ntop-compat'
i
nto maint
commit
|
commitdiff
|
tree
2012-02-14
Junio C
Hamano
M
erge branch '
m
p/make-cle
a
nse-
x
-for-exe' into
ma
i
nt
commit
|
commitdiff
|
tree
2012-02-14
Junio C Hamano
Merge
b
ranch '
j
n/merge-no-edit-
f
ix'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2012-02-13
Junio C Hamano
Upd
a
te draft r
e
l
ease notes to 1
.
7
.
9
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-13
Jun
i
o C Hamano
Merge branch
'
js/
a
dd-
e
-
s
u
b
module-fix' into maint
commit
|
commitdiff
|
tree
2012-02-13
J
u
nio C Hamano
M
erge br
a
n
c
h 'jc/parse-date-raw'
into maint
commit
|
commitdiff
|
tree
2012-02-13
Juni
o
C
Hamano
M
erge
b
r
a
nch 'jc/merge-ff-o
n
l
y-stronger-than-signed
.
.
.
commit
|
commitdiff
|
tree
next