repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-12-09
Jun
i
o C Ham
a
no
Merge gi
t
://git
.
kernel
.
or
g
/
p
ub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
H
ama
n
o
Upda
t
e
draft
r
elease note
s
t
o
1
.
6
.
6
before -rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C
H
aman
o
Mer
g
e br
a
nch 'ma
i
nt
'
commit
|
commitdiff
|
tree
2009-12-09
Junio C
Hama
n
o
M
erge bran
c
h 'mm/maint-
m
erge
-
ff-error-message-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io C Hamano
Merge
br
a
nch 'jn/mai
n
t-pull-rebase-error-message' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
J
unio C Hamano
Merge branch
'jk/ma
i
n
t-add
-
p
-
de
l
e
t
e-fix' into maint
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
H
a
m
ano
Merge git:
/
/git
.
bogom
i
ps
.
org/gi
t
-svn
commit
|
commitdiff
|
tree
2009-12-08
Jun
i
o C
Hamano
Revert rece
n
t
"
g
it merge <m
s
g> HE
A
D <com
m
it>
.
.
.
"
d
eprecation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-08
Jeff K
i
ng
add-inter
a
ctive: f
i
x
d
ele
t
ion of non-empty files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-06
S
Z
ED
E
R Gábor
bash: update 'git commit
'
completion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hamano
S
ync with 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio
C
Hamano
G
i
t 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Linus Torvald
s
Fix diff -B/--dirst
a
t miscou
n
ti
n
g of newly added
contents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Jeff King
r
e
s
e
t: improve w
o
rktree
safety valv
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
To
d
d Zullinge
r
D
o
cumenta
t
io
n
: A
v
oid use of xm
l
to --stringparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
R
e
né
S
char
f
e
a
r
c
h
ive:
c
l
a
rify description
o
f
pat
h
parame
t
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
Jeff Kin
g
rerere: don't s
e
gfault on failure
t
o
open rr-cac
h
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge
b
ranch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Prepar
e
f
o
r
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
rge branch 'uk/
m
ai
n
t
-shor
t
log-encoding' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
M
e
rge branch 'fc
/
m
a
i
n
t-format-patch-
p
athspec
-
dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'ap/maint-merge-strateg
y
-list-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge branc
h
'
j
c/
m
ain
t
-
am-ke
e
p
'
i
nto ma
i
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Ha
m
ano
Merge branc
h
'
r
s
/
w
o
rk-aro
u
nd-
g
rep-opt-in
s
anity
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merge branch 'rj
/
m
a
i
n
t-c
y
gwin-count-objects' into main
t
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C
H
amano
Merge branch '
m
m/main
t
-h
i
nt-failed-merge' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
M
erge b
r
anch 'th/ma
i
nt-remote-up
d
ate
-
help-string' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Merge b
r
anch '
r
j/mai
n
t-t9700' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
b
ranc
h
'ls/maint-
m
ailinf
o
-no-inbody' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
M
erge branch 'mo/maint-c
r
lf
-
doc
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merg
e
branch
'
th/remote-usage' into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
m
ano
Merge branch 'pb/
m
aint-use
-
custom
-
p
e
rl'
i
nto
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Mer
g
e bra
n
ch 'm
m
/c
o
nfig-pathna
m
e
-
tilde-expand' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C
Hamano
Merge branch 'bc/grep
-
i-F' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C
Hama
n
o
Mer
g
e branch 'jk/maint-break-rename-reduce-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Mer
g
e bra
n
ch '
r
j/
m
aint-sim
p
lify-c
y
gwin-makefile' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch '
r
g
/
d
o
c-w
o
rkflow' into main
t
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge branch 'np/maint-sid
e
ba
n
d-favor-
s
t
a
t
u
s'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
a
k
ub
Narebski
gitweb: Describe (possible)
g
itweb
.
js m
i
ni
f
ication
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
unio C
H
amano
Documentation: xmlto 0
.
0
.
18 does not know --stringparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herland
Fix
c
ra
s
her on encountering SHA1-like non
-
note
in notes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Brand
o
n Case
y
t90
0
1
: use o
l
der
G
eto
p
t::
L
ong boolean prefix '--no
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Brandon Casey
t
4
2
0
1
: us
e
ISO885
9
-1 r
a
ther tha
n
ISO-8859-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jan Krüger
p
ull:
c
l
a
r
i
fy advice fo
r
the unco
n
figu
r
ed error case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Haman
o
Me
r
ge in 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Git 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
n
o
Unconditionall
y
set
man
.
base
.
url
.
fo
r
.
rela
t
ive
.
l
i
n
ks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C Ham
a
n
o
Documenta
t
ion/Makefile:
al
l
o
w m
a
n
.
base
.
url
.
fo
r
.
r
e
lative
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
io C Hamano
Git 1
.
6
.
6-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Horst
H
.
von Bra
n
d
git-pu
l
l
.
sh: Fix
c
all to git-
m
erge for new command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C H
a
mano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Prepare for 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio
C
Hamano
m
e
rge: do
n
ot add st
a
ndard me
s
sage when message
i
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C H
a
mano
Do not misident
i
fy "git merge foo HEAD" as
a
n old-sty
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
U
pdate draft release notes
to 1
.
6
.
6
before
-
rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Jun
i
o
C
Hamano
M
e
rge br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Ham
a
n
o
Merge branch 'j
c
/d
e
precate-ol
d
-syntax-from-merge'
commit
|
commitdiff
|
tree
2009-12-01
Junio C H
a
mano
git-
m
erge: a deprecat
i
on n
o
tice of the
ancient command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
J
unio C
H
am
a
no
M
erge branch 'bw
/
remote-get-ref-sta
t
e
s
-fix'
commit
|
commitdiff
|
tree
2009-12-01
Bert Wesar
g
get
_
ref_states: strdup
e
ntrie
s
an
d
free uti
l
in stale
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
D
a
vid Agu
i
lar
help: Do n
o
t
unnecessarily
lo
o
k for a repository
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Michael J Grube
r
D
oc
u
m
e
ntat
i
on: Fix a few i
.
e
.
/
e
.
g
.
mix-ups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C
Hamano
Me
r
ge br
a
nch 'jn/gitweb-blame'
commit
|
commitdiff
|
tree
2009-12-01
Jakub Narebski
gitweb: Add lin
k
t
o o
t
her
b
lame implement
a
tion in blame
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Jakub Nar
e
bski
gitweb
:
Make linking
to actions re
q
u
i
r
ing JavaScr
i
pt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'fc/maint-format
-
pa
t
ch-pathsp
e
c-dashes'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
i
o
C Hamano
Merge branch 'mm/maint-merge-ff-err
o
r-
m
e
ssage-fix'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C Hamano
Merge
b
ranc
h
'ap/m
a
int-merge-strate
g
y-list-
f
ix'
commit
|
commitdiff
|
tree
2009-11-30
J
unio C Hamano
M
e
rge
b
ranch 'jc/
p
retty-lf'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge
b
ranch 'cc/bisect-doc'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
i
o
C Hamano
Me
r
g
e
br
a
nch 'em/co
m
mit-cl
a
im'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio C Haman
o
Merge branch 'jc/mailinfo-rem
o
ve
-
brackets'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merg
e
bran
c
h 'fc/send-email-e
n
velope'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio C Hamano
Me
r
ge br
a
nch 'uk/maint-shortlog
-
encoding'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio
C H
a
m
ano
Merge bra
n
c
h 'ns/sen
d
-email-
n
o-c
h
ain-reply-to'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C
Ham
a
no
M
e
rge branch 'j
c
/m
a
int-am-ke
e
p'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
Ha
m
an
o
Merg
e
b
ranch
'
bw/
d
iff-color-hunk-
h
e
ader'
commit
|
commitdiff
|
tree
2009-11-30
David Soria Parra
Document
a
t
ion
:
D
o
c
ument
--bran
c
h
optio
n
i
n
git cl
o
ne
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Matthieu Moy
builtin-merge: show user
-
fr
i
endly error
messages for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Matthieu Moy
merge-recursiv
e
: make th
e
error-mess
a
ge g
e
neration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Matt
h
ew Ogilv
i
e
t
/README: Docu
m
en
t
GIT_TEST_INSTALLED
a
n
d
GI
T
_TEST_EXEC_PATH
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Matthew Ogilvie
t3409 t4
1
07
t
7406 t
9
150:
use d
a
shless
c
o
m
mands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
A
v
ery Penn
a
run
builtin-merge
.
c
:
c
a
l
l exclu
d
e_cmds()
correctly
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Mat
t
hew
Ogilv
i
e
t
2300: use documented te
c
hnique to invoke
g
i
t-sh-s
e
tu
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-29
N
an
a
ko Shirais
h
i
prepare
send-email for smoother
c
h
a
nge of
-
-chain-repl
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
Junio C Ha
m
ano
Update draft
release notes to 1
.
6
.
6
befo
r
e
m
erging
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
Jonathan Nieder
Make
f
ile: do not clean arm d
i
rec
t
or
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
Bert Wesarg
Give the hunk
comment
its own color
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
Felipe Contr
e
ras
send
-
ema
i
l
:
automatic envelope
se
n
d
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
J
u
n
io C Ham
a
no
emit_li
n
e(): d
o
n't emi
t
an empty <SET>
<
RESET> followed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Hamano
R
emove dead
code
f
rom
"git am"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Ham
a
no
Merge br
a
nch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-11-27
J
ohannes Sixt
Add
a
notice that
o
nly certain f
u
nctions can print
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
F
e
lipe
C
on
t
r
eras
for
m
at-patch: add t
e
s
t
for parsing of "--"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Felipe Co
n
treras
f
ormat-patch:
fix
p
arsing of "--" o
n
the c
o
mm
a
nd line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
J
u
n
i
o C Hama
n
o
built
i
n-apply
.
c
:
p
ay
a
ttention to -p<n> w
h
en determining
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Björn Gustavsson
gitworkflows
:
Co
n
sisten
t
ly back
-
quote gi
t
commands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
U
w
e Kl
e
ine-König
s
h
o
rtlog: respect
commit enco
d
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
J
unio C Hama
n
o
Me
r
ge branch 'rs/wo
r
k-around-grep-opt-
i
nsanity'
commit
|
commitdiff
|
tree
next