repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jg/auto-initialize-notes-with-percent-n-in-format'
2010-03-31
J
u
n
io C Hama
n
o
Merge branch 'jc/m
a
int
-
refs-
d
angling'
into main
t
commit
|
commitdiff
|
tree
2010-03-31
Holger Weiß
D
ocumentation:
s
h
ow-ref <pattern>s
are optional
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Holger We
i
ß
Link against libiconv on IRIX
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Holger Weiß
Don't redefin
e
htonl and
n
t
o
hl on bi
g
-endian
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Jakub Na
r
ebski
gitweb
:
git_get_pro
j
e
c
t_config requires only $g
i
t_di
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Jan Stępień
Updated the
u
sage str
i
ng of g
i
t r
e
set
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Gr
e
g Bac
o
n
Docume
n
tation
:
Clari
f
y
s
upp
o
rt for s
m
art HTT
P
backend
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Johannes
Sixt
Windows: fix ut
i
me() for read-only fi
l
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Johanne
s
Sixt
diff: fix textconv
error
z
ombie
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Junio C Hamano
Merge branch
'
ma
i
n
t'
commit
|
commitdiff
|
tree
2010-03-30
Kevi
n
B
a
llard
format-patch: Squelch 'fata
l
: No
t
a
range
.
" err
o
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Mi
c
hae
l
J Gruber
refs
.
c:
Write
reflogs for note
s
just like for branch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Michael
J Gru
b
e
r
t3
3
01-notes: T
e
st
t
he creation of reflo
g
ent
r
ies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Ian Ward Comfort
RPM spec: include bash
c
o
m
p
l
etion support
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Junio C H
a
mano
U
pda
t
e
d
r
aft release notes to 1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Junio C Ha
m
ano
M
e
rge branch
'cc/
c
herry-p
i
ck-ff'
commit
|
commitdiff
|
tree
2010-03-29
J
u
nio C Hamano
Merg
e
b
r
anch '
s
b/notes
-
par
s
e-opt'
commit
|
commitdiff
|
tree
2010-03-29
Junio C Hamano
M
e
r
ge branch
'mai
n
t'
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Makefile: Remove usage of deprecat
e
d Python "
h
as_
k
ey
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Thomas R
a
st
rebase -i: make post-re
w
rite work for
'
e
d
it'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Ju
n
io C Hamano
Prepare for 1
.
7
.
0
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Junio
C
H
am
a
no
Merge branc
h
'cp/add-u-paths
p
ec'
i
nto maint
commit
|
commitdiff
|
tree
2010-03-29
Ju
n
i
o
C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-03-29
Junio C Hamano
t9350: fix
c
a
r
eless use of "cd"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difftool: Fix '--g
u
i' when diff
.
guito
o
l
is unco
n
figured
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
Sve
r
re Rabbelier
fast-expor
t
:
don't segfault when mar
k
s
file cannot
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
Chris Webb
ima
p
-send: suppress warning
a
b
out cle
a
rtext password
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
Michael J Grube
r
send-
e
mail: lazily a
s
sign editor var
i
abl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
Steph
e
n Boyd
fmt-merge-msg
:
hide
s
u
mmary option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
S
teph
e
n Boy
d
fmt
-
merge-msg
:
remove cu
s
tom str
i
ng_lis
t
i
mp
l
emen
t
ation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
S
tephen Boyd
string-list: a
d
d unso
r
ted_string_list_lookup()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
St
e
p
h
en
Boyd
fmt-merge
-
m
s
g: use
prett
y
.
c ro
u
tines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
Stephen Boyd
t6200: test fmt-merge
-
m
sg more
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
Stephen Boyd
t6200: modernize
with test_
t
ick
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
S
tephen Bo
y
d
fmt-merge
-
msg:
be
quie
t
if n
o
thing to
m
erge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
Junio C Hamano
d
iff --che
c
k: honor conf
l
ict
-
marker-size attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Junio C Ham
a
no
Merge branch 'jh/maint-submodule-st
a
tus-in-void'
commit
|
commitdiff
|
tree
2010-03-24
Ju
n
io C Hama
n
o
Merge
branch 'tr/n
o
tes-display'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Merge branch 'jl/submodu
l
e-diff-di
r
tiness'
commit
|
commitdiff
|
tree
2010-03-24
Junio
C
Hamano
Merge
b
ranc
h
'pb/log-first-parent-p-m'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
M
e
r
ge b
r
anc
h
'jc/ma
i
nt-refs
-
dangling'
commit
|
commitdiff
|
tree
2010-03-24
Junio C H
a
mano
Mer
g
e
branch 'main
t
'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Haman
o
Merge branch 'jc/color-attrs' into maint
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Merge br
a
n
c
h 'jk/maint-add
-
ignored-dir'
into maint
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
M
e
rge br
a
n
c
h 'bg/apply-fix-b
l
ank-at
-
eof
'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2010-03-24
Mar
c
Branchaud
Teach r
e
bas
e
the --no-ff option
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Shaw
n
O
.
Pearce
htt
p
-back
e
n
d: Don't infin
i
te loop during die()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
R
.
Tyler Bal
l
ance
Correct references to /usr/bi
n
/python w
h
ich does
not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Mark
u
s Heidelberg
Documentat
i
on: expl
a
in the
m
eaning of "-g" in g
i
t
-desc
r
i
b
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
M
i
chael J Gru
b
er
r
ev-list: use default abbrev le
n
g
t
h when abbrev-commit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Ramkumar R
a
machandra
imap
-
s
end: Remo
v
e limitat
i
on o
n
mes
s
age
body
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-22
J
unio C
H
amano
S
y
n
c
wit
h
G
i
t
1
.
7
.
0
.
3
commit
|
commitdiff
|
tree
2010-03-22
J
u
nio C Hamano
Git 1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-22
J
u
n
io C H
a
m
a
no
Merge
branch '
m
a
int-1
.
6
.
6' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2010-03-21
Micha
e
l J G
r
uber
.
mailmap:
Map the
the firs
t
submissions
o
f
M
JG
by e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Erik Fa
y
e
-Lund
ls: re
m
ov
e
red
u
n
dant logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Erik Faye-Lund
cherry: sup
p
ort
-
-
abbrev op
t
i
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Grub
e
r
Documentation/g
i
t-clone: Transform desc
r
iption li
s
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
D
ocumentat
i
on/urls:
Remove
spur
i
ous
e
xamp
l
e markers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Mi
c
ha
e
l J Gruber
Documentat
i
on/git
d
if
f
c
ore: Remove mis
l
e
adin
g
da
t
e i
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
M
ichael J
G
r
uber
Docu
m
entation/git-r
e
flog: Fix formatting of command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Erik
Fa
y
e
-Lund
r
e
v-list: fix --pretty=oneline with em
p
ty message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
a
n
N
ieder
mer
g
e-recursiv
e
:
add a label f
o
r
ancest
o
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
der
cherry-pick, revert:
a
d
d a label for ancestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nied
e
r
r
e
v
ert:
c
larify labe
l
on conflict h
u
nks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
compat: add mempcpy()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than Nieder
c
h
eckout -m -
-
conflict=dif
f
3:
add a label for a
n
cestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
ona
t
han Nieder
merge_trees
(
):
a
dd ancestor label para
m
e
t
er for diff3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nie
d
er
me
r
ge_f
i
le(): add comment
e
xp
l
ai
n
ing b
e
havior
wrt conflict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than Nieder
checkout --confl
i
ct=diff3
:
add a label for ancestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ied
e
r
ll_merge(): add ances
t
or la
b
e
l
param
e
t
e
r for
d
i
ff3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an Nie
d
er
merge-file --di
f
f3: add
a label for ancestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
xdl_merge(): m
o
v
e file1 and file2 labels to
x
mpara
m
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
a
n
Nieder
xdl_me
r
ge(): add op
t
ional ancestor label to diff3-style
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an Nieder
te
s
ts:
d
ocument cherry-pick
b
ehavior in
face o
f
co
n
flicts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onat
h
an Nieder
t
ests:
d
ocument format of conflicts from
checkout
-
m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
.
mai
l
ma
p
: Entries f
o
r Alex Bennée,
D
e
s
kin Miller, Vita
l
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
N
ieder
r
e
ve
r
t: f
i
x tiny
m
e
m
ory leak in cherry-pick --ff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Junio
C
Hamano
Upda
t
e draft
r
eleas
e
notes to 1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jun
i
o
C Haman
o
Merge branch 'jk/maint-ad
d
-i
g
nored-dir
'
commit
|
commitdiff
|
tree
2010-03-20
Jun
i
o C Hamano
Merge branch 'ml/color-grep'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C Hamano
Merge branch 'jc/c
o
l
o
r-attrs'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C
Ham
a
no
M
e
rge branch
'cc/reset-keep'
commit
|
commitdiff
|
tree
2010-03-20
Junio C
H
amano
Merg
e
b
r
an
c
h 'fl/askpass'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Mer
g
e
br
a
nch 'bg
/
appl
y
-
fix-blank-at-
e
of
'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C
Hamano
Merge br
a
nch '
b
w
/union-merge-refactor'
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io C
Ha
m
ano
Merge
b
r
a
nch 'm
a
int'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Update draft rel
e
ase n
o
tes t
o
1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Ch
r
i
s
tian Couder
rebase
-
i: use n
e
w --
f
f cher
r
y-pick option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gr
u
en
b
a
cher
fetch: Fix
mi
n
or memory
l
ea
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Andrea
s
Gruenba
c
h
er
fetch: Future-proof ini
t
iali
z
ation
of a ref
s
pec
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gruenba
c
her
fet
c
h: Check
for a "^{}" su
f
fix with suffixcm
p
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Ben
j
amin C M
e
yer
Fix
a
s
pel
l
ing
mistake in a git-p4 console me
s
s
a
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Br
i
an Gernhardt
Use te
s
t_expect_su
c
cess for test setups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Ben Walton
Modernize g
i
t calling conventions
i
n hook templates
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
B
e
n
Walton
M
ake templates hono
u
r SHEL
L
_PATH and PE
R
L_PATH
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
I
m
re
Deak
daemon: parse
_
host_and_port S
I
G
SEGV if port is s
p
ecifi
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan N
i
eder
Mak
e
f
ile: Fi
x
o
c
casional GIT-CFLAGS breakage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Nieder
Mak
e
file: Fix CDPATH problem
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Brand
o
n Casey
t/t5505-remote
.
sh: es
c
ape * to preven
t
interpretat
i
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next