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
Ham
a
no
merge: t
e
ach -Xours/
-
Xth
e
irs to binary ll-merge drive
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Jun
i
o C Hamano
Git
1
.
7
.
9
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Junio C
Hamano
S
ync with
1
.
7
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
Junio C
Hamano
Git 1
.
7
.
8
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Jun
i
o
C Hamano
Sy
n
c with 1
.
7
.
7
.
7
commit
|
commitdiff
|
tree
2012-04-26
Juni
o
C
Hamano
Git 1
.
7
.
7
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-10
J
u
n
io C H
a
m
a
no
Me
r
ge bra
n
ch
'm
a
int-1
.
7
.
8'
i
nto mai
n
t-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-09
Junio C
H
aman
o
Merge branch 'j
c
/mai
n
t-verify-object
s
-remove-pessim
i
sm
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
J
u
nio C Hamano
Merge br
a
n
ch 'dw/gitweb-doc-gr
a
mmo' into main
t
-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
M
erge br
a
nch '
t
r
/
cache-tree'
i
nto maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
J
unio C
Ha
m
ano
Merge bra
n
ch 'c
b
/
ma
i
nt-t5541-m
a
ke-ser
v
er-port
-
portab
l
e
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Ju
n
io C
H
amano
Merge b
r
anch 'cn/main
t
-rev-list-doc' into maint
-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C
H
amano
Merge branc
h
'tr/mai
n
t
-
b
u
n
dle-boundar
y
' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C
H
amano
Merge branc
h
'tr/maint-b
u
ndle-long
-
s
u
b
j
e
c
t' int
o
maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hama
n
o
M
erge branch 'ph/rerere-doc' into mai
n
t
-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-02
J
u
nio C Hamano
G
it
1
.
7
.
9
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-02
Ju
n
io C
H
a
man
o
Merge branch '
j
c/mai
n
t-merge-autoedit' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
Git 1
.
7
.
9
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
Ju
n
io C Hamano
M
e
rge b
r
an
c
h 'jn/m
a
i
n
t-fast-import-emp
t
y-ls' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
Mer
g
e branch
'ph/rerer
e
-
d
oc' into
m
aint
commit
|
commitdiff
|
tree
2012-03-26
Jun
i
o C Hamano
M
erg
e
b
ranch '
m
s/main
t
-con
f
i
g
-error-at-eol-line
c
ount
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Ju
n
io C Haman
o
M
e
rge branch 'maint-1
.
7
.
8
'
i
nt
o
maint
commit
|
commitdiff
|
tree
2012-03-20
J
u
ni
o
C Hamano
merge: back
p
o
rt GIT_MERGE_AUTOEDIT support
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-20
Ju
n
io C H
a
m
a
no
Merge branch 'ks/sort-wildcard-in
-
makefile'
i
nto maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
J
unio C H
a
mano
Merge
b
r
anch '
j
c/advise-i18n
'
into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
J
unio C Hamano
M
erge branc
h
'jn/gitweb-unspecified-action' in
t
o maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-15
Junio
C
Hamano
f
etch/receive:
rem
o
ve
o
ver-pes
s
im
i
stic connecti
v
ity
.
.
.
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
u
nio C H
a
man
o
Merge bran
c
h 't
r
/m
a
int-bun
d
le-boundary'
into maint
commit
|
commitdiff
|
tree
2012-03-12
Junio C
H
ama
n
o
Mer
g
e br
a
n
c
h
'jc/
m
a
i
nt-diff-patch-header' into maint
commit
|
commitdiff
|
tree
2012-03-12
Junio C H
a
mano
Merge br
a
n
ch 'jn/maint-do-
n
ot-match-with-unsanitized
.
.
.
commit
|
commitdiff
|
tree
2012-03-12
Junio C
Haman
o
M
e
rge branc
h
'
j
c/am-3-nonst
a
n
dar
d
-popt' into maint
commit
|
commitdiff
|
tree
2012-03-06
Junio C Hamano
Mer
g
e
bran
c
h 'maint-1
.
7
.
8' into ma
i
nt
commit
|
commitdiff
|
tree
2012-03-06
Ju
n
io C Hamano
Me
r
ge bran
c
h 'maint
-
1
.
7
.
7
' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-05
Junio C H
a
mano
Gi
t
1
.
7
.
9
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Merge bra
n
c
h '
j
c/doc-merge-options' into main
t
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
M
er
g
e branch 'cn/ma
i
n
t-rev-list-doc' into
maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C H
a
m
ano
Upd
a
te
d
raft release
notes
to
1
.
7
.
9
.
3
fo
r
the last
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-05
Junio C Ha
m
ano
Merge branch
'
cn/ma
i
nt-
b
ranch-with-bad' i
n
t
o
maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Merge branch 'jn/maint-gitweb
-
invalid-regexp
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Junio C Haman
o
Merge br
a
nch
'
n
d
/ma
i
nt-
v
erify-object
s
' int
o
maint
commit
|
commitdiff
|
tree
2012-03-05
Jun
i
o C Hamano
Merge branch 'jk/maint-avoid-streaming-filtered-contents
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Merge bran
c
h 'j
b
/filter-ign
o
re-sigp
i
pe'
into maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hama
n
o
Merge branch 'sp/
s
m
a
rt-ht
t
p-
f
ailure-to-pu
s
h' into maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Merge branch 'tr/maint-bundle-long-sub
j
ect' int
o
maint
commit
|
commitdiff
|
tree
2012-03-02
Junio
C
Ha
m
ano
Docum
e
ntation: 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: squelch "diff --gi
t
" header for s
t
at
-
dirty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
Junio C Ha
m
ano
t4011: illustrate
"diff-index -p"
on
s
tat-dirty pat
h
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
J
u
nio C
Ham
a
no
t40
1
1: modernise style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
J
unio C Haman
o
Upda
t
e
draft release notes
t
o 1
.
7
.
9
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Junio C
Ha
m
a
n
o
Merge bra
n
c
h
'pj/rem
o
te-se
t
-branch
e
s-
u
sage-fix'
into
.
.
.
commit
|
commitdiff
|
tree
2012-02-27
Junio
C Hamano
Mer
g
e branch 'jn/gitweb
-
unb
o
rn-head' into
m
aint
commit
|
commitdiff
|
tree
2012-02-27
Junio C
Hamano
Merge br
a
nch 'jn
/
an
c
ient-meld-support'
in
t
o maint
commit
|
commitdiff
|
tree
2012-02-27
Junio C
Hamano
Merge branch 't
r
/merge-e
d
it-gui
d
ance'
into maint
commit
|
commitdiff
|
tree
2012-02-27
Junio
C Hamano
t
est: "am
-3" c
a
n accept
n
o
n
-
standard -p<
n
um>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Ju
n
io C
H
aman
o
Document accumulated fix
e
s since 1
.
7
.
9
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Merge branch 'jc/add
-
re
f
resh-unmerged' i
n
to maint
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Merge br
a
nch 'js/co
n
figur
e
-libintl
'
int
o
maint
commit
|
commitdiff
|
tree
2012-02-27
Junio C
H
amano
S
y
nc with 1
.
7
.
8
.
5
commit
|
commitdiff
|
tree
2012-02-27
Junio C
Hamano
Git
1
.
7
.
8
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-23
Juni
o
C Hamano
Docu
m
ent me
r
g
e
.
branchdesc confi
g
uration var
i
able
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-23
Junio C
H
amano
am
-3:
a
l
low nonsta
n
dard -
p
<
n
um> op
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-23
Junio
C Hamano
G
it 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
cu
m
entation/me
r
g
e-opti
o
ns
.
txt: group "ff" rel
a
t
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-21
Junio
C
Ha
m
ano
Upda
t
e dr
a
ft release notes to
1
.
7
.
9
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
Merge bra
n
ch
'cb
/
rec
e
ive-pack-
k
e
e
p-errors' into maint
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
Merge branch 'cb
/
tran
s
fer-no-progress'
into maint
commit
|
commitdiff
|
tree
2012-02-21
Junio C
H
amano
Merge branch '
j
k/git-dir-look
u
p' int
o
maint
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
Merge
b
ra
n
ch 'jc
/
diff-st
a
t-scaler' int
o
maint
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
Merge
b
ra
n
ch 'zj/
t
erm-col
u
mns' into maint
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
Merge b
r
anc
h
'cb/maint-rev-list-veri
f
y-object
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
Merge
b
ranch 'cb/maint-t5541-make-server
-
p
ort-portable
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
J
u
nio C H
a
m
ano
M
e
rge branc
h
'dp/i18n-l
i
bchar
s
et' in
t
o
m
ain
t
commit
|
commitdiff
|
tree
2012-02-21
Junio C Ha
m
ano
Merge br
a
nch 'jk/grep-
b
in
a
ry-attribut
e
' into maint
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
Merge branch
'nd/diff
s
t
a
t-g
r
amnum
'
int
o
maint
commit
|
commitdiff
|
tree
2012-02-21
Jun
i
o
C Hamano
Merge branch 'nd/find-pa
c
k-
e
n
t
ry-recent-cache-invalid
a
tion
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
Jun
i
o C Hamano
Merge
bra
n
ch 't
t
/profile-build-fix' into ma
i
nt
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hama
n
o
Mer
g
e branch 'fc/zsh
-
completion' in
t
o maint
commit
|
commitdiff
|
tree
2012-02-20
Junio C Hamano
Update draft relea
s
e 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_index: d
o
n
o
t sh
o
w unmerged path
that
i
s outside
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-16
Junio
C
Hamano
U
pdate draft relea
s
e 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 br
a
nch 'jc/checkou
t
-
out-
o
f-unborn
'
i
n
t
o maint
commit
|
commitdiff
|
tree
2012-02-16
Junio C
Hamano
M
e
rge branc
h
'jc/
m
a
i
nt-mailmap-o
u
tput' into maint
commit
|
commitdiff
|
tree
2012-02-16
Junio
C
Haman
o
Me
r
ge
branch 'jk/promp
t
-fallback-
t
o
-
tty'
i
nto
ma
i
nt
commit
|
commitdiff
|
tree
2012-02-16
Ju
n
io
C Haman
o
M
e
r
g
e branch 'jn
/
gitweb-search-
u
tf-8' into
ma
i
nt
commit
|
commitdiff
|
tree
2012-02-16
Junio C Hamano
Merge bran
c
h 'jc/maint-commit-igno
r
e
-i-
t
-a'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2012-02-16
Junio C Hamano
Me
r
ge
b
r
a
n
ch 'mm
/
em
p
ty-loose-error-message
'
into
m
aint
commit
|
commitdiff
|
tree
2012-02-16
Junio C H
a
m
ano
Merg
e
branch 'nk/cty
p
e-fo
r
-perf' i
n
to maint
commit
|
commitdiff
|
tree
2012-02-16
Junio C Hamano
Merge branch 'j
x
/i18n-more-markin
g
' into ma
i
nt
commit
|
commitdiff
|
tree
2012-02-16
Ju
n
io C
H
amano
Merge branch 'rt/co
m
pletio
n
-branch
-
edit-desc' into
.
.
.
commit
|
commitdiff
|
tree
2012-02-14
Juni
o
C
Hamano
d
iff --
s
tat: sho
w
b
ars of
s
am
e
length fo
r
paths
w
ith
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-14
Jun
i
o C Hamano
Git 1
.
7
.
9
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-14
J
unio
C Hama
n
o
Mer
g
e branch 'jk/maint-tag
-
show-fixes' into
m
aint
commit
|
commitdiff
|
tree
2012-02-14
Junio C Hama
n
o
Merge branch
'bw
/
inet-pton-ntop-comp
a
t' into maint
commit
|
commitdiff
|
tree
2012-02-14
Junio C Hamano
Merge bra
n
ch 'mp/
m
ake-c
l
eanse-x-fo
r
-exe' into
m
aint
commit
|
commitdiff
|
tree
2012-02-14
Junio C Hamano
Merge bra
n
ch 'jn/merge-no
-
e
d
i
t
-f
i
x'
i
nto maint
commit
|
commitdiff
|
tree
2012-02-13
Junio C Hamano
Update draft rele
a
se
notes to 1
.
7
.
9
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-13
Junio C Haman
o
M
e
rge
b
r
anc
h
'js/add-e-sub
m
odule-fix' into m
a
int
commit
|
commitdiff
|
tree
2012-02-13
Junio C
H
amano
M
erge branch 'jc/parse-date-raw' int
o
maint
commit
|
commitdiff
|
tree
2012-02-13
Junio C H
a
ma
n
o
Merge branch 'jc/merge-ff
-
only-stronger-than-
s
i
gned
.
.
.
commit
|
commitdiff
|
tree
next