repo.or.cz
/
git
/
wpalmer.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
revert: clarify label on conflict hunks
2010-03-20
Junio
C
Hamano
U
p
d
a
te draft re
l
ease no
t
es to
1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Junio
C Hamano
M
erge
branch 'jk/maint-
a
dd-ignored-dir'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Ham
a
no
M
e
r
ge branch 'ml/co
l
o
r
-grep'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Ha
m
a
no
Merge
b
ranch 'jc/c
o
lor-attr
s
'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C
Hamano
Merge
b
r
a
n
c
h 'cc
/
r
e
set-keep'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
M
e
rge branch 'fl/askpas
s
'
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io C Hamano
Merge br
a
nch 'bg
/
apply-fix-bla
n
k-a
t
-eof'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge br
a
nch 'bw/union-m
e
rge-re
f
actor'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Ha
m
a
no
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-03-20
J
u
nio C Hamano
Upd
a
te dr
a
ft
r
elease notes to 1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Jun
i
o C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-03-17
Junio C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-15
Junio
C
H
am
a
no
Merge bran
c
h
'
sd
/
format-
p
atch-to'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
M
e
rge branch
'
tc/http-
c
lea
n
u
p
'
commit
|
commitdiff
|
tree
2010-03-15
Junio C
Haman
o
Merge branc
h
'
tc
/
tra
n
sp
o
rt-verbos
i
ty'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
Merge bra
n
c
h 'ld/push-porcelain'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
Merg
e
branch 'jh/notes'
commit
|
commitdiff
|
tree
2010-03-14
J
unio
C Hamano
tes
t
s for "git a
d
d ignored-dir/file" without -f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Junio C Hamano
t0
0
50:
m
a
rk non-
w
o
r
k
ing test
as such
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
J
unio C Haman
o
Mer
g
e
branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-03-13
Junio C
Ha
m
ano
t/Makefile: remove test artifacts upo
n
"mak
e
clean"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Junio C
Ha
m
an
o
Merge
g
it://gi
t
.
bogo
m
ips
.
o
r
g/git-svn
commit
|
commitdiff
|
tree
2010-03-13
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-12
J
u
n
io C Hamano
t
551
6
:
Use test_c
m
p when appropriate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-12
Junio C Hamano
t9400: Use test
_
cmp when appr
o
pr
i
a
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-10
Jun
i
o
C Haman
o
Merge branch 'sd/init-template'
commit
|
commitdiff
|
tree
2010-03-10
Junio
C Hamano
Merge
b
ranch 'sh/am-k
e
ep
-
cr'
commit
|
commitdiff
|
tree
2010-03-10
Junio C
H
a
ma
n
o
Me
r
ge branch 'cp/add-u-pathspe
c
'
commit
|
commitdiff
|
tree
2010-03-10
Junio C H
a
ma
n
o
Makefi
l
e:
update check-docs ta
r
get
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-10
J
u
nio C Ham
a
no
M
erge br
a
nch 'lt/
d
eepen-b
u
iltin-source'
commit
|
commitdiff
|
tree
2010-03-09
Junio
C
Hamano
D
o
cumentation: im
p
rove descri
p
tion of "
g
it reset -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Upda
t
e dra
f
t release notes to 1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Jun
i
o C Hamano
Mer
g
e branch '
m
aint'
commit
|
commitdiff
|
tree
2010-03-08
J
un
i
o C
Hamano
M
e
rge
accumulated fix
e
s to p
r
epar
e
fo
r
1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge bran
c
h
'mw/maint-g
c
c-warns-unu
s
ed-write' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Ju
n
i
o
C Ham
a
n
o
Mer
g
e branch
'fn/
m
aint-mkdtemp-compat' into maint
commit
|
commitdiff
|
tree
2010-03-08
Jun
i
o C Hamano
M
erge br
a
nch 'gb/mai
n
t-subm
o
dule-env' i
n
to maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
M
erge
branc
h
'as/maint-exp
i
re'
into main
t
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Me
r
ge branch '
m
l/maint-grep-doc' into maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge branch
'jk
/
ma
i
nt-p
u
sh-tracking-wo
-
remote' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio
C
Hamano
Merge branch 'jc/fetch-param' int
o
m
a
int
commit
|
commitdiff
|
tree
2010-03-08
Junio C Ha
m
a
no
Merge branc
h
'ne/pack
-
local-doc' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge branch 'jk/mai
n
t-
a
d
d--interactive-delete' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge branch 'mm/mkstemps-m
o
de-for
-
packfiles' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Ju
n
i
o C Ha
m
a
n
o
Mer
g
e
branch 'jc/main
t
-fix-maili
n
fo-
s
t
rip'
into
m
aint
commit
|
commitdiff
|
tree
2010-03-08
J
u
nio C Hamano
Merge branch
'
j
c
/grep-a
u
thor-all-match-implicit
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio
C
Hamano
Merge b
r
anc
h
'jc/checkout-detache
d
' i
n
to
m
aint
commit
|
commitdiff
|
tree
2010-03-08
Junio C Haman
o
Merge
b
r
a
nch 'maint-1
.
6
.
6' into mai
n
t
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C Hamano
Merge branc
h
'jc
/
m
a
int-fix-test-perm' into ma
i
nt-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
J
u
n
io C H
a
m
a
n
o
Merge branch 'sp
/
ma
i
nt-push-sideband' into
maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
J
u
n
i
o
C Ha
m
ano
Merge
b
ranch
'h
m
/
maint-imap-send-crlf' into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio
C H
a
mano
Merge branch 'g
f
/
m
aint-sh-setu
p
-nong
i
t
-ok' into m
a
i
n
t
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge branch
'
jk
/
m
a
i
n
t-
r
mdir-fix' int
o
maint
-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Haman
o
Merge br
a
n
ch 'r
s
/optim-t
e
x
t
-wrap
'
into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Jun
i
o
C Hamano
Merge branch 'tr/m
a
int
-
cher
r
y-pick-lis
t
'
into ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hama
n
o
Merge branch 'cc/maint-bisect
-
path
s
' into mai
n
t-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Haman
o
Mer
g
e b
r
anch
'mw/maint-gcc
-
warns-unused-write'
commit
|
commitdiff
|
tree
2010-03-07
Ju
n
i
o
C
Hamano
Merge br
a
nch 'as/maint-e
x
pire
'
commit
|
commitdiff
|
tree
2010-03-07
J
unio
C
Hamano
Me
r
ge branc
h
'ml
/
maint-grep-doc
'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hama
n
o
Merge branch 'fn
/
maint-mkdtemp-compat'
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
Ha
m
an
o
Merge branc
h
'gb/maint-su
b
module
-
en
v
'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge branch
'ne/
p
ack-lo
c
a
l
-doc'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
M
erge br
a
n
c
h
'
m
b/shortlog
-
nongit-stdin'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge
bran
c
h 'jk/m
a
int-push
-
track
i
n
g
-wo
-
rem
o
te'
commit
|
commitdiff
|
tree
2010-03-07
Ju
n
io C Ha
m
ano
Merge branch 'jc/fetch-param'
commit
|
commitdiff
|
tree
2010-03-07
Ju
n
io C Hamano
Merge branc
h
'il/
l
oosen-remote-he
l
per-names'
commit
|
commitdiff
|
tree
2010-03-07
Junio C
H
amano
Merge branch 'n
d
/root-git'
commit
|
commitdiff
|
tree
2010-03-07
J
unio C
Ham
a
no
Merge bra
n
ch 'js/runtime-
p
refix-trace-not-warn'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Ha
m
ano
Merge branch 'm
m
/mkstemps-
m
o
d
e-for-packfiles'
commit
|
commitdiff
|
tree
2010-03-07
Junio
C Hamano
Mer
g
e branch 'jk/maint-add--interactive-dele
t
e
'
commit
|
commitdiff
|
tree
2010-03-07
Jun
i
o C Hamano
Mer
g
e branch 'jc/
m
aint-fi
x
-m
a
i
linfo
-
strip'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hama
n
o
color:
a
llow
mul
t
ip
l
e
attribu
t
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Juni
o
C Hamano
S
y
nc with
1
.
7
.
0
.
2
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
G
it 1
.
7
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-05
Junio
C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-05
Junio C Ha
m
ano
U
p
date dra
f
t
r
elease no
t
es to 1
.
7
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-05
J
u
nio C Hama
n
o
M
erge branch 'jn/gi
t
we
b
-config-error
-
die' in
t
o main
t
commit
|
commitdiff
|
tree
2010-03-05
J
u
n
i
o
C Hamano
Merge branch 'j
n
/maint-fix-pager' into maint
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
M
e
rge branch 'tr/ma
i
nt-cherr
y
-pick-
l
ist'
into m
a
in
t
commit
|
commitdiff
|
tree
2010-03-05
Junio C
H
amano
Merge branch
'
ld/
m
aint-diff-quiet-w' in
t
o
mai
n
t
commit
|
commitdiff
|
tree
2010-03-05
Jun
i
o
C
H
amano
Me
r
ge branch 'r
s
/opti
m
-
t
ext-wr
a
p' into
m
aint
commit
|
commitdiff
|
tree
2010-03-05
Ju
n
io C Hamano
Merge
br
a
nch 'dp/read-
n
ot-mmap-sma
l
l
-
loose-object'
.
.
.
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
Merg
e
br
a
nch 'np/compr
e
ss-loose-
o
b
j
ect-memsave' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-05
Junio C
Hamano
Merge bran
c
h 'jc/maint-status
-
preload' into
maint
commit
|
commitdiff
|
tree
2010-03-05
Junio
C Hamano
Merge
b
ranch '
g
f/maint-s
h
-setu
p
-
n
ongi
t
-ok' into maint
commit
|
commitdiff
|
tree
2010-03-05
J
u
n
i
o
C Ha
m
ano
Merge branc
h
'
cc/maint-bis
e
ct-paths' into maint
commit
|
commitdiff
|
tree
2010-03-05
J
unio C
Hama
n
o
Merge b
r
anch 'maint-
1
.
6
.
6' in
t
o
maint
commit
|
commitdiff
|
tree
2010-03-05
Junio
C Hamano
Me
r
ge branch 'maint-1
.
6
.
5' into
maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-03
Junio C Hamano
M
e
rge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-03-03
Juni
o
C
Hamano
Merge branch 'j
h
/maint-submodu
l
e-
s
tatus-i
n
-v
o
id' (early
.
.
.
commit
|
commitdiff
|
tree
2010-03-03
Junio C Hamano
Start preparing for 1
.
7
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-03
J
u
nio C
H
amano
Merge branch '
t
c/m
a
int-tr
a
nspo
r
t-ls-remo
t
e-with-void
.
.
.
commit
|
commitdiff
|
tree
2010-03-03
Junio
C Hamano
Merge branch 'hm/maint-imap-send
-
crlf' into maint
commit
|
commitdiff
|
tree
2010-03-03
Jun
i
o
C Ham
a
no
Mer
g
e branch 'sp/ma
i
nt-push-sideban
d
' into maint
commit
|
commitdiff
|
tree
2010-03-03
Junio C Hama
n
o
M
erge branch 'jc
/
main
t
-fix-te
s
t-perm
'
int
o
maint
commit
|
commitdiff
|
tree
2010-03-03
Ju
n
i
o C Hamano
M
erge
b
ranch 'np/
f
a
st-import-idx-v2' in
t
o maint
commit
|
commitdiff
|
tree
2010-03-03
J
u
nio C Hamano
wrap-for
-
bin: do n
o
t export an
e
mpty GIT_TEM
P
LATE_
D
IR
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-02
Ju
n
i
o
C Ha
m
ano
M
erge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-03-02
Jun
i
o
C
Haman
o
Merge b
r
anch 'jn/maint-fix-pager'
commit
|
commitdiff
|
tree
next
