repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
diff-files: show unmerged entries correctly
2011-04-24
Junio C Ham
a
no
d
if
f
-files: sh
o
w unme
r
ged entries
co
r
re
c
tly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
Hamano
diff: remove often
u
nused parameters from diff
_
unm
e
rge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C Hamano
d
if
f
.
c: return filepair f
r
om diff_unmerg
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
test: use $_z40 from t
e
s
t
-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-18
Junio C H
a
mano
Git
1
.
7
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-18
Junio C Hamano
Merge bran
c
h 'js/ls
-
f
i
les-
x
-doc'
commit
|
commitdiff
|
tree
2010-09-16
Junio C
Hamano
M
e
rge branch '
b
g/fix-t700
3
'
commit
|
commitdiff
|
tree
2010-09-16
Junio C
Ham
a
no
l
s
-
files documentation:
reword f
o
r consistency
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-15
J
u
nio C
Hamano
Git 1
.
7
.
3 rc2
commit
|
commitdiff
|
tree
2010-09-15
Junio C Ham
a
n
o
Merge bran
c
h '
d
r/maint-ls-tree
-
pref
i
x
-
recursion-
f
i
x
'
commit
|
commitdiff
|
tree
2010-09-15
J
un
i
o C Hamano
M
e
rg
e
branch 'os/fi
x
-rebas
e
-diff-no-prefix'
commit
|
commitdiff
|
tree
2010-09-15
Junio C Hamano
Merge branch 'jl/fix-test'
commit
|
commitdiff
|
tree
2010-09-15
Junio C Hamano
Me
r
ge b
r
anch 'ch/filter-br
a
n
ch-dep
r
ecate-remap-t
o
-
ancest
o
r'
commit
|
commitdiff
|
tree
2010-09-15
Junio C
H
amano
Merge branch
'ch/mai
n
t-cannot-
c
reate-bun
d
le-error'
commit
|
commitdiff
|
tree
2010-09-15
Junio
C Haman
o
Merge
branch 'ks/
r
ecursive-renam
e
-ad
d
-identical'
commit
|
commitdiff
|
tree
2010-09-15
Junio C Ham
a
no
Merge git://repo
.
or
.
cz/git
-
gui
commit
|
commitdiff
|
tree
2010-09-12
Ju
n
io C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-09-12
J
u
nio
C Ha
m
a
n
o
ls-tree $
d
i $dir
:
do
not mis
t
ake
n
ly recurse i
n
t
o
dire
c
tories
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-12
J
u
nio C Ham
a
no
t3101: modernise s
t
yle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Junio C Hamano
Git 1
.
7
.
3 rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Junio
C Hamano
Mer
g
e
branch '
n
p/
r
elnotes-i
n
-subdir
'
commit
|
commitdiff
|
tree
2010-09-10
Jun
i
o
C Hamano
Pre
p
are
f
or
1
.
7
.
3
rc1
commit
|
commitdiff
|
tree
2010-09-10
Ju
n
i
o C
H
amano
Merge br
a
nch
'
m
aint'
commit
|
commitdiff
|
tree
2010-09-10
J
uni
o
C
Ha
m
ano
M
e
r
ge b
r
anch
'
maint'
commit
|
commitdiff
|
tree
2010-09-09
Junio C Ham
a
n
o
install-
w
ebdoc: keep installed
R
elNotes-*
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-08
Junio C Hamano
Merge branch '
t
f/cleanup-builtin-help-header
s
'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Hamano
Merge branch 'jk/test-must-fail-missing'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Hamano
Merge bra
n
ch 'jh/err
o
r
-removing-missing-
n
ote'
commit
|
commitdiff
|
tree
2010-09-08
Junio
C
Hamano
Merge bra
n
ch 'k
f
/askpass-config'
commit
|
commitdiff
|
tree
2010-09-08
Junio C H
a
mano
Merge br
a
nch 'bc/ma
i
nt-fetc
h
-url
-
only'
commit
|
commitdiff
|
tree
2010-09-08
Ju
n
io C Hamano
Me
r
ge br
a
nch
'jk/main
t
-pa
s
s-c-config-in-env'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Hamano
Merg
e
branch
'en/d-f-conflict-fix'
commit
|
commitdiff
|
tree
2010-09-07
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-09-06
Junio C Ha
m
ano
M
erge branch 'jh/clean-exclude'
commit
|
commitdiff
|
tree
2010-09-06
Jun
i
o
C Hamano
Merge bran
c
h
'jl/main
t
-
f
i
x-te
s
t'
commit
|
commitdiff
|
tree
2010-09-06
J
u
n
io C
H
amano
Me
r
ge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-09-06
Ju
n
i
o C Hamano
Merge b
r
a
nch 'xx/tri
v
i
al' into
maint
commit
|
commitdiff
|
tree
2010-09-06
J
unio
C
Ham
a
no
tag
.
c: whitespace brea
k
ages fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-04
Juni
o
C Ha
m
ano
Merge
br
a
nch 'jl/sub
m
o
dule-ignore-diff'
commit
|
commitdiff
|
tree
2010-09-04
J
unio C Haman
o
Merge b
r
anch 'ab/test-2'
commit
|
commitdiff
|
tree
2010-09-04
Junio C
H
amano
Me
r
ge
branc
h
'js/de
t
ached-stash'
commit
|
commitdiff
|
tree
2010-09-04
Junio C Hamano
Merge branch 'js/maint-ref
l
o
g
-beyond-hor
i
zon'
commit
|
commitdiff
|
tree
2010-09-04
Junio C H
a
m
a
n
o
M
e
r
g
e
bra
n
c
h
'dg/local-mod-error-messages'
commit
|
commitdiff
|
tree
2010-09-04
Junio C Hama
n
o
M
e
r
g
e br
a
nch 'nd/ma
i
nt-fi
x
-
r
epl
a
ce
'
commit
|
commitdiff
|
tree
2010-09-03
J
u
nio C Hamano
Merge branc
h
'ab/compat-regex'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Merge bran
c
h
'
nd/
c
lone-depth-zero
'
commit
|
commitdiff
|
tree
2010-09-03
J
unio C Haman
o
Merge branch 'j
n
/m
a
in
t
-
d
oc-user-ma
n
u
a
l-html
-
doctype'
commit
|
commitdiff
|
tree
2010-09-03
Ju
n
io C
Hamano
Merge b
r
anch 'cb/mai
n
t-mergetool-no-tty
'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hama
n
o
Merge branch 'jn
/
apply-filename-wi
t
h-sp'
commit
|
commitdiff
|
tree
2010-09-03
Juni
o
C H
a
mano
Merge branch 'jn/merge-custom-no-t
r
ivial'
commit
|
commitdiff
|
tree
2010-09-03
Junio
C Hamano
Mer
g
e bran
c
h 'jc/ma
i
nt-do
c
-
e
m-
d
a
s
h
'
commit
|
commitdiff
|
tree
2010-09-03
J
u
n
i
o
C Ha
m
a
n
o
Merg
e
branch '
m
g/d
o
c-bundle'
commit
|
commitdiff
|
tree
2010-09-03
J
u
nio C Haman
o
Merge bra
n
ch '
j
n/doc-backsl
a
sh'
commit
|
commitdiff
|
tree
2010-09-03
Junio C
H
amano
M
e
rge branc
h
'jn/update-c
o
ntrib-e
x
ample-mer
g
e'
commit
|
commitdiff
|
tree
2010-09-03
Ju
n
io C Hamano
Merge branch 'jn/m
e
rge-renormaliz
e
'
commit
|
commitdiff
|
tree
2010-09-03
Junio
C
Hamano
Sync with
1
.
7
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Junio C H
a
mano
Git 1
.
7
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-01
Junio C Hamano
Pr
e
pare fo
r
1
.
7
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-01
Junio C
Haman
o
Merge
b
ranch 'main
t
'
commit
|
commitdiff
|
tree
2010-09-01
Juni
o
C H
a
m
a
n
o
Prepare for 1
.
7
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-01
Ju
n
i
o C Hamano
M
e
rge br
a
nch 'gp/pa
c
k-
r
efs-remov
e
-empty-dirs' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
J
u
nio C Hama
n
o
Me
r
g
e
br
a
nch 'sg/rerere-gc
-
o
l
d-still-use
d
'
i
nto maint
commit
|
commitdiff
|
tree
2010-09-01
Junio
C
H
amano
Merge br
a
nch 'np/maint-
h
u
ge-delta-
g
e
neration' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
Junio C Hamano
Merge branch 'dj/fetch-tagopt'
into maint
commit
|
commitdiff
|
tree
2010-09-01
Junio C Hamano
Merg
e
b
ranch
'da/fix-submo
d
ule-sync-superproject-config
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
Junio
C
H
amano
Merg
e
branch 'en/
r
ebase-against-rebase-fix'
into maint
commit
|
commitdiff
|
tree
2010-09-01
Junio C
H
am
a
n
o
instal
l
-webdoc: filter ti
m
es
t
a
m
p
-onl
y
changes
c
orrect
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge b
r
anch 'np/maint-h
u
g
e-delta-gen
e
ration'
commit
|
commitdiff
|
tree
2010-08-31
Junio C
H
amano
M
e
rge
branch 'da/fix-su
b
module-sync-superproject-co
n
fig'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Ha
m
ano
M
e
rg
e
branch 'jn/cher
r
y-r
e
vert-mess
a
ge-cle
a
n-up'
commit
|
commitdiff
|
tree
2010-08-31
Jun
i
o C
H
amano
Merge branch 'cb/binary-p
a
tch-id'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Haman
o
Me
r
ge branc
h
'ab/maint-reset-mixed-w-
p
athspec-a
d
vice'
commit
|
commitdiff
|
tree
2010-08-31
J
u
nio C Hamano
Merge
branch 'dj/f
e
t
c
h-t
a
g
o
pt'
commit
|
commitdiff
|
tree
2010-08-31
Junio C H
a
m
a
n
o
Merge branch
'en
/
d-f-conflict-fi
x
'
commit
|
commitdiff
|
tree
2010-08-31
J
unio C Hamano
Mer
g
e branch 'jn/svn-fe'
commit
|
commitdiff
|
tree
2010-08-31
Junio C H
a
mano
M
e
rge
b
ranch 't
r
/m
a
int-n
o
-un
q
uote-plus'
commit
|
commitdiff
|
tree
2010-08-31
J
u
n
io C Hamano
Merge branch
'
jn/paginate-f
i
x'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
M
erge bra
n
ch '
j
n/m
a
int-setup-
f
i
x'
commit
|
commitdiff
|
tree
2010-08-31
Ju
n
io C Ham
a
n
o
Merge bra
n
ch 'en/fas
t
-export-fix'
commit
|
commitdiff
|
tree
2010-08-31
Junio
C Hama
n
o
Merge br
a
n
ch 'hv/autosqu
a
sh-co
n
fi
g
'
commit
|
commitdiff
|
tree
2010-08-31
Juni
o
C Hamano
Merg
e
branch 'sg/re
r
ere-gc-old-still-used'
commit
|
commitdiff
|
tree
2010-08-30
Junio
C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2010-08-30
J
unio C Ha
m
ano
Me
r
ge
b
ranch 'maint-1
.
7
.
1' into maint
commit
|
commitdiff
|
tree
2010-08-26
Junio C
Hamano
M
e
r
g
e b
r
anch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-08-24
Junio C Hama
n
o
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-08-24
Junio C Hamano
Work
around em-
d
ash hand
l
i
n
g i
n
newer
AsciiDoc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-23
Junio C Ha
m
ano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
autoconf: rege
x
l
i
b
ra
r
y detecti
o
n
typof
i
x
commit
|
commitdiff
|
tree
2010-08-22
Ju
n
io
C Hamano
M
e
rge b
r
anch
'
mm/re
b
ase-i-e
x
e
c
'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hama
n
o
M
e
rge bra
n
ch
'
g
b/split-cmdlin
e
-
e
r
rmsg'
commit
|
commitdiff
|
tree
2010-08-22
Jun
i
o
C
H
amano
Merge branch 'so/
h
ttp-u
s
er-agent'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hama
n
o
Merge branch 'mm/shortopt-detac
h
ed'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
M
erge bran
c
h '
s
r/loca
l
-config'
commit
|
commitdiff
|
tree
2010-08-22
Junio
C Hamano
Merge b
r
anch 'nd/fi
x
-sparse-
c
heckout'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge b
r
anch 'hv/sub
m
odule-find-ff-mer
g
e'
commit
|
commitdiff
|
tree
2010-08-22
J
u
nio C Hamano
Merge b
r
anc
h
'en/rebase-agai
n
s
t
-rebase-fix'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merg
e
bra
n
ch 'dg/local-mo
d
-error-m
e
ss
a
ges'
commit
|
commitdiff
|
tree
2010-08-22
J
u
nio C
H
aman
o
Merg
e
branch 'po/userdiff-csharp
'
commit
|
commitdiff
|
tree
2010-08-22
J
uni
o
C Hamano
Merge
br
a
nch
'
ab/perl-install'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Ha
m
ano
Merge branch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
next