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 Haman
o
diff-files: show unm
e
rge
d
e
n
tri
e
s co
r
rectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C Hamano
diff: r
e
move often unused parameters from diff_
u
nm
e
rg
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C
Ha
m
ano
d
i
ff
.
c
: return
file
p
air from d
i
ff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ha
m
an
o
te
s
t:
use $_z40 from
t
es
t
-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-18
Junio C
Haman
o
Git 1
.
7
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-18
Junio
C Ha
m
ano
Me
r
ge branch 'js
/
ls-f
i
le
s
-x-
d
oc'
commit
|
commitdiff
|
tree
2010-09-16
Junio C Hamano
Me
r
ge branch 'bg
/
fix-t7003'
commit
|
commitdiff
|
tree
2010-09-16
Junio C Ha
m
ano
ls-files
docu
m
entation: rewo
r
d for consistency
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-15
Junio
C Hamano
Git 1
.
7
.
3 r
c
2
commit
|
commitdiff
|
tree
2010-09-15
Junio C Hamano
Mer
g
e branc
h
'dr/
m
aint-ls-tree-
p
refix-recursion-fix'
commit
|
commitdiff
|
tree
2010-09-15
Junio C
H
amano
M
erge
branch
'
os/
f
ix-rebase-
d
iff-no-p
r
efi
x
'
commit
|
commitdiff
|
tree
2010-09-15
Junio C Hamano
Merge branch 'jl/fi
x
-test'
commit
|
commitdiff
|
tree
2010-09-15
Junio C H
a
m
ano
Merge branch 'ch/f
i
l
ter
-
branch
-
deprecate-remap
-
to
-
ance
s
tor'
commit
|
commitdiff
|
tree
2010-09-15
Jun
i
o C Hamano
Merge branc
h
'ch/maint-cannot-create
-
bundl
e
-error'
commit
|
commitdiff
|
tree
2010-09-15
Junio C Hamano
M
e
r
g
e
bra
n
ch
'ks/recursive-re
n
a
m
e-add-ident
i
c
al'
commit
|
commitdiff
|
tree
2010-09-15
J
unio C Hama
n
o
Merge
g
it://repo
.
or
.
cz
/
git
-
gui
commit
|
commitdiff
|
tree
2010-09-12
Junio
C
Ha
m
a
n
o
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2010-09-12
Junio C Haman
o
ls-
t
ree $di $dir: do not mistakenly recu
r
se in
t
o
dir
e
ctor
i
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-12
Junio C H
a
mano
t3101: modern
i
se style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Ju
n
io C Hamano
Gi
t
1
.
7
.
3
r
c1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Jun
i
o C Hamano
Merge br
a
n
ch '
n
p/re
l
notes-in-su
b
d
i
r
'
commit
|
commitdiff
|
tree
2010-09-10
J
u
n
io C Hamano
Prepare fo
r
1
.
7
.
3 rc
1
commit
|
commitdiff
|
tree
2010-09-10
Junio C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2010-09-10
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-09-09
Jun
i
o
C Ham
a
no
in
s
tall-webdoc: kee
p
installed RelNotes-
*
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-08
Jun
i
o C Hamano
Merge branch 'tf/clea
n
up-builtin-help-headers
'
commit
|
commitdiff
|
tree
2010-09-08
Junio C
Hamano
Merg
e
bra
n
ch
'
j
k/t
e
s
t
-must-fail-missing'
commit
|
commitdiff
|
tree
2010-09-08
Jun
i
o C Hama
n
o
M
e
rge br
a
nch 'jh/error-removin
g
-missing-n
o
te'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Haman
o
Merge
br
a
n
c
h 'kf/askp
a
ss-
c
onfig'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Hamano
Mer
g
e
branch 'bc/main
t
-fetch-url-only'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Ha
m
a
n
o
Me
r
ge
b
ranch 'jk/maint-pass-c-config-i
n
-env'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Hamano
Merge branch 'en/d-f-conf
l
ict-fix
'
commit
|
commitdiff
|
tree
2010-09-07
Junio C
Ha
m
an
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-09-06
Junio C Hamano
M
er
g
e
branch 'jh
/
clean-
e
xclude'
commit
|
commitdiff
|
tree
2010-09-06
J
u
n
io
C
H
amano
Me
r
ge branch 'jl/maint-fix-test'
commit
|
commitdiff
|
tree
2010-09-06
Jun
i
o C Ham
a
no
Me
r
ge b
r
anch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-09-06
J
u
nio C Hamano
Merg
e
b
ranc
h
'xx
/
triv
i
al' into
mai
n
t
commit
|
commitdiff
|
tree
2010-09-06
Ju
n
io
C
H
amano
tag
.
c: whitespace
b
reakages fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-04
Ju
n
io C Hamano
Mer
g
e br
a
nc
h
'
j
l/submo
d
ule-ignore-diff'
commit
|
commitdiff
|
tree
2010-09-04
Junio C
Hamano
M
e
rge branch
'
a
b/te
s
t-2'
commit
|
commitdiff
|
tree
2010-09-04
Juni
o
C Ha
m
ano
Mer
g
e bran
c
h 'js/detached-stash'
commit
|
commitdiff
|
tree
2010-09-04
Junio
C Hamano
Merge branch 'js/maint-reflog-beyo
n
d-h
o
rizon'
commit
|
commitdiff
|
tree
2010-09-04
Junio C Hamano
Merge bra
n
ch
'dg/loc
a
l-mod-e
r
ror
-
me
s
sages'
commit
|
commitdiff
|
tree
2010-09-04
Juni
o
C Hamano
Merge bra
n
ch
'nd
/
ma
i
n
t
-fix
-
replace'
commit
|
commitdiff
|
tree
2010-09-03
Jun
i
o
C H
a
m
a
no
Merge branch 'ab
/
c
o
mp
a
t-regex'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Merge
b
ranch
'
n
d/clone-d
e
pth
-
zero'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hama
n
o
Merge bran
c
h
'jn/
m
aint-doc-us
e
r-man
u
al-html-do
c
type'
commit
|
commitdiff
|
tree
2010-09-03
Ju
n
i
o
C Hamano
Merge
branch 'cb/maint-
m
er
g
etool
-
no-tty
'
commit
|
commitdiff
|
tree
2010-09-03
J
unio C Hamano
Merge branch 'jn/apply-fil
e
name-with-sp'
commit
|
commitdiff
|
tree
2010-09-03
Juni
o
C Hamano
M
erge
b
r
a
n
c
h
'jn/merge-
c
ust
o
m
-no-trivia
l
'
commit
|
commitdiff
|
tree
2010-09-03
Junio C H
a
mano
Merge b
r
anch
'jc/maint-doc-em-da
s
h'
commit
|
commitdiff
|
tree
2010-09-03
Junio
C Hamano
M
e
rge b
r
anch 'mg/doc-bun
d
le'
commit
|
commitdiff
|
tree
2010-09-03
Jun
i
o C
Ha
m
ano
Merge br
a
nch
'
jn/
d
o
c
-backslash'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Merge branch 'jn/update-contrib
-
e
xample-m
e
rge
'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Ha
m
ano
Merge branch 'jn/
m
erge-renorm
a
lize'
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
amano
Git 1
.
7
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-01
J
uni
o
C Hamano
Prep
a
r
e
f
o
r 1
.
7
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-01
Junio C
H
a
m
ano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2010-09-01
J
u
n
i
o C Hamano
P
repa
r
e for
1
.
7
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-01
Junio C Hamano
Mer
g
e br
a
nch
'
gp/pack-refs-remove-empty-dirs'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
Junio C Hamano
Merge b
r
anch 'sg/rer
e
re-gc-old-st
i
ll-used' into maint
commit
|
commitdiff
|
tree
2010-09-01
Ju
n
io
C
Haman
o
Merg
e
branch 'np/maint-hu
g
e-delta-generation' into
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
J
u
nio C
H
amano
Merge bran
c
h
'
dj/fetch-tagopt
'
into m
a
i
n
t
commit
|
commitdiff
|
tree
2010-09-01
Juni
o
C H
a
mano
Merge branch 'da/fix-submo
d
ule-
s
y
nc-su
p
e
r
pr
o
jec
t
-config
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
Junio C Ham
a
no
Merge branch 'en/rebase
-
against
-
reb
a
se-fi
x
'
into m
a
in
t
commit
|
commitdiff
|
tree
2010-09-01
Junio C Hamano
ins
t
all-webdoc: filter timestamp-only changes co
r
rectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge branch 'np/maint-huge
-
del
t
a-gene
r
at
i
on'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Haman
o
Mer
g
e bran
c
h 'da
/
fix-submodule-sync
-
s
uperp
r
oject-config'
commit
|
commitdiff
|
tree
2010-08-31
Junio C H
a
mano
Merge branch
'
jn/cherry-revert-message-cle
a
n-up'
commit
|
commitdiff
|
tree
2010-08-31
J
u
nio C Hamano
Merge branch
'cb/binary-p
a
t
ch-id'
commit
|
commitdiff
|
tree
2010-08-31
Jun
i
o
C
Hamano
Me
r
ge
branch
'ab/
m
ai
n
t-reset-mixed-w-pathspec-advi
c
e'
commit
|
commitdiff
|
tree
2010-08-31
J
unio
C Haman
o
M
e
rge branch 'dj/fetch-ta
g
opt'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Me
r
ge branch
'en/d-f-
c
o
nflict-fix'
commit
|
commitdiff
|
tree
2010-08-31
J
unio C
H
amano
Me
r
ge b
r
anch 'jn/svn-fe'
commit
|
commitdiff
|
tree
2010-08-31
Junio
C
Hamano
Merge bra
n
ch 'tr/maint-no-unq
u
ote-plu
s
'
commit
|
commitdiff
|
tree
2010-08-31
Junio C H
a
man
o
Merg
e
branch
'jn/paginate-fix'
commit
|
commitdiff
|
tree
2010-08-31
Junio C
H
aman
o
Merge br
a
nch 'jn/maint-
s
etup-fix'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hama
n
o
Merge
b
ranch 'en/fast-export-
f
ix'
commit
|
commitdiff
|
tree
2010-08-31
Ju
n
io C Hamano
Merge
branch 'hv/autosqu
a
sh-
c
onfig'
commit
|
commitdiff
|
tree
2010-08-31
J
u
nio
C
Ham
a
no
Merge branch 'sg/rerere-gc-old-still-used'
commit
|
commitdiff
|
tree
2010-08-30
J
u
nio C Hamano
Me
r
ge b
r
anch 'main
t
'
commit
|
commitdiff
|
tree
2010-08-30
Junio C Hamano
Merge
branch 'm
a
int
-
1
.
7
.
1' i
n
t
o
maint
commit
|
commitdiff
|
tree
2010-08-26
J
u
nio C Hamano
Merge branch
'
m
a
i
nt'
commit
|
commitdiff
|
tree
2010-08-24
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-08-24
J
u
nio C Hamano
Work
a
round e
m
-
d
ash h
a
ndling in newer AsciiDoc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-23
Junio C
Hamano
M
e
rge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-08-22
Junio
C
H
a
mano
a
u
t
oconf: r
e
gex l
i
brary detection
typofix
commit
|
commitdiff
|
tree
2010-08-22
Ju
n
io
C Hamano
Merge branch 'mm/rebase-i-
e
x
e
c'
commit
|
commitdiff
|
tree
2010-08-22
J
uni
o
C Hamano
Merge bra
n
c
h 'gb/split-cmdline-er
r
msg'
commit
|
commitdiff
|
tree
2010-08-22
J
un
i
o C
H
a
m
ano
Me
r
ge branch 'so/http-us
e
r
-agent'
commit
|
commitdiff
|
tree
2010-08-22
Junio
C
Ha
m
ano
Merge branch
'
m
m
/sho
r
topt-detached'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge branch 'sr/local-config'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge branch 'n
d
/fix-sparse-ch
e
ckout'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge branch 'hv/submodule-
f
ind-ff-merge
'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merg
e
branch 'en/r
e
base-a
g
ainst-rebase-fix
'
commit
|
commitdiff
|
tree
2010-08-22
Junio
C
Ha
m
ano
M
e
r
ge branch '
d
g/local-mo
d
-error-
m
e
s
sages'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
M
e
rge
b
ranch 'po/userdiff-
c
sharp'
commit
|
commitdiff
|
tree
2010-08-22
J
u
n
io
C Ham
a
no
Merge br
a
nch 'ab/per
l
-
i
n
s
t
a
ll'
commit
|
commitdiff
|
tree
2010-08-22
Junio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
next