repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
diff-options: make --patch a synonym for -p
2010-04-01
Christian Couder
merge: refact
o
r code that calls "git merge
-
S
TRATEGY"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-01
Christian C
o
uder
r
e
v
e
rt: refactor mer
g
e r
e
c
ursive code i
n
to its
ow
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-01
Chri
s
tia
n
Coud
e
r
r
e
vert: us
e
st
r
buf to refactor the code tha
t
writes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Jun
i
o
C Hamano
S
ync
w
ith 1
.
7
.
0
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Junio C Ha
m
ano
Git 1
.
7
.
0
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Junio
C
Haman
o
M
erge branch
'jc/maint-r
e
fs-dangling' i
n
to maint
commit
|
commitdiff
|
tree
2010-03-31
H
olger
W
e
i
ß
Documentation:
s
h
ow-re
f
<pattern>s are optional
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
H
olge
r
Weiß
Lin
k
a
gainst l
i
biconv o
n
IRIX
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Hol
g
er Wei
ß
Don't redefine htonl and n
t
ohl on big-endi
a
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Jakub Narebski
git
w
eb: git_get_
p
roject_co
n
fig requ
i
res only
$git_dir
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Jan Stępień
Up
d
a
t
ed t
h
e usage
s
tring of git res
e
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Greg
B
aco
n
Do
c
umentation: Clar
i
fy supp
o
rt fo
r
smar
t
HTTP back
e
nd
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Johannes Si
x
t
Windows: fix utime() fo
r
read-only files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Johan
n
es Sixt
diff: fix textconv
error zombies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Junio C Hamano
Me
r
ge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-03-30
Kevin Ba
l
lard
fo
r
ma
t
-patch:
Squ
e
lch 'fata
l
:
N
o
t a ra
n
ge
.
" error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Michael J Grube
r
refs
.
c: Write refl
o
gs
f
or
n
otes
just like
f
or branch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Michael
J Gruber
t3
3
0
1
-notes
:
Test the creation of reflog entries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Ian Ward Comfort
R
PM sp
e
c: inclu
d
e
bash complet
i
on support
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Junio C Ha
m
ano
Updat
e
draft releas
e
notes to 1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Junio C Hamano
Mer
g
e branch 'c
c
/cher
r
y-pick-ff'
commit
|
commitdiff
|
tree
2010-03-29
Junio C
H
amano
Merge branc
h
'sb/notes-
p
arse-
o
p
t'
commit
|
commitdiff
|
tree
2010-03-29
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-29
Dav
i
d A
g
uilar
Make
f
il
e
: R
e
move
u
sa
g
e
of deprec
a
ted Py
t
hon "has_
k
ey
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Thom
a
s R
a
st
rebase -i: make post-rewrite work for
'edit'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
J
u
nio C
H
amano
P
repare for 1
.
7
.
0
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Junio C Haman
o
Merge branch 'c
p
/
add-u-path
s
pec
'
into main
t
commit
|
commitdiff
|
tree
2010-03-29
Junio C Hama
n
o
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-29
Jun
i
o C Hamano
t93
5
0: fix careless use of "c
d
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
Peter Colli
n
gbourne
Remove a redundant errno t
e
st in
a
u
s
a
ge o
f
remove_path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
Peter Collin
g
bourne
Intr
o
duce remove_or_warn function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
P
e
ter Collingbourne
Implement the r
m
dir_or_warn f
u
nc
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
Peter
Colling
b
ourne
Generalise the unlink_or_wa
r
n function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
D
avid Aguil
a
r
diffto
o
l: Fix '--gui' when diff
.
guit
o
o
l is
u
ncon
f
ig
u
red
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
S
v
e
r
r
e
Rabbelier
fast-export:
d
on't segfault
when marks file ca
n
not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
Chris Webb
im
a
p
-
send: suppr
e
s
s
warning about cleartext password
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
Michael J G
r
uber
send
-
email
:
la
z
i
l
y assign
editor variable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
Ste
p
hen Bo
y
d
fmt-merg
e
-msg: hide summary option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
St
e
p
h
en Boy
d
fmt-
m
erge-ms
g
:
remove custom strin
g
_l
i
st implementation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
Stephen Boyd
string-list: a
d
d unsorted_string_list_
l
o
okup()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
S
tephen
Boyd
f
mt-me
r
ge-msg: use pretty
.
c ro
u
tines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
S
teph
e
n Boyd
t
6
2
0
0
:
test fmt-merge-ms
g
m
ore
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
Stephen
B
o
y
d
t6200:
m
o
d
ernize with
test_tick
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
S
tephen Boy
d
fm
t
-merge-m
s
g: be qui
e
t if not
h
ing to merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
Junio C
H
amano
diff
--ch
e
ck: honor conflict-mark
e
r-size attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Junio C H
a
m
a
no
Merge bran
c
h
'
j
h
/mai
n
t
-
submodule-status-in-void'
commit
|
commitdiff
|
tree
2010-03-24
Junio C
H
am
a
no
Merge branch
'tr/notes-display'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Merge
b
ra
n
ch 'jl/submodul
e
-diff-dirtiness
'
commit
|
commitdiff
|
tree
2010-03-24
Ju
n
io C Hamano
Merge branch 'pb/log-first-pa
r
ent-p-m'
commit
|
commitdiff
|
tree
2010-03-24
J
unio
C Hamano
Merge br
a
nch 'jc/m
a
int-refs-dangling'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Haman
o
Merge bran
c
h 'main
t
'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Merge
branch 'jc/co
l
or-attrs'
i
nto main
t
commit
|
commitdiff
|
tree
2010-03-24
Ju
n
io C Hamano
Merge branc
h
'jk/ma
i
nt-add-i
g
nored-dir
'
into maint
commit
|
commitdiff
|
tree
2010-03-24
Ju
n
i
o C Hamano
M
e
rge branch
'bg/apply-fix-blank-
a
t-eof' into maint
commit
|
commitdiff
|
tree
2010-03-24
Marc Branchau
d
T
e
ach rebase th
e
--no
-
f
f option
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Shaw
n
O
.
Pearc
e
http-backend: Don'
t
inf
i
n
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
B
alla
n
c
e
Correc
t
references to /
u
sr/b
i
n/pyt
h
on w
h
ich does not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
M
arkus Heidelberg
Documentatio
n
: expl
a
i
n
th
e
meaning of "
-
g
" in git-descr
i
b
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Michael
J Gruber
rev-list:
u
se defau
l
t
a
b
b
rev length wh
e
n abb
r
e
v
-
co
m
mit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
R
a
mkumar Ramachandra
imap-sen
d
: Remove
limi
t
a
tion on
m
e
ssage body
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-22
Junio C Hamano
Sync with Git 1
.
7
.
0
.
3
commit
|
commitdiff
|
tree
2010-03-22
Junio
C Ham
a
n
o
G
it 1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-22
Junio C Hamano
Merge bra
n
ch 'maint-1
.
6
.
6' into mai
n
t
commit
|
commitdiff
|
tree
2010-03-21
Michael J
Grub
e
r
.
mail
m
ap: Map the th
e
first
s
ubmission
s
o
f
MJG by
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
E
rik Faye-Lund
ls: remove re
d
undant logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Erik F
a
ye-Lund
c
her
r
y: support --abbr
e
v option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
M
ichae
l
J Gr
u
b
er
Document
a
tion/
g
it-cl
o
n
e
: Transform description list
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Mic
h
ae
l
J
Gruber
Document
a
t
i
on/urls: Remove spuri
o
us example ma
r
k
e
rs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
Documentatio
n
/git
d
iffcore: Remove
misleading date in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Mic
h
ae
l
J Gru
b
er
Doc
u
mentation/git-re
f
lo
g
:
Fix forma
t
ting
of comm
a
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Erik Faye-Lund
r
e
v-lis
t
: fix --pretty=oneline with empt
y
message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n
Ni
e
der
m
e
rge-recursive: ad
d
a label
f
o
r
ancestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan N
i
eder
cherr
y
-pick, revert: a
d
d a label for ances
t
or
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan
N
ie
d
e
r
revert: clarify label
o
n conflict hunks
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
Jonatha
n
Nieder
checkou
t
-m --conflict=diff3: add a label for
a
ncestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge_trees(): add
ancest
o
r la
b
el parameter
for
diff3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
h
an Nieder
merge_
f
ile(): add comment e
x
plaining behav
i
or w
r
t
conflict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n
Nieder
checkout
-
-conflic
t
=d
i
ff3: a
d
d a
label for ances
t
or
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
ll
_
merge(): add ancestor label pa
r
ame
t
er for
diff3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan
N
ieder
merge-file -
-
diff3: add a la
b
el for ancestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Niede
r
x
dl_
m
e
r
ge(): move file
1
and f
i
le2 la
b
els to xmparam
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than Nie
d
e
r
xdl_merge(): add optional ancestor
l
ab
e
l to diff3-style
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
tests:
d
ocument cherry-pick behavior
in face o
f
conflicts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
te
s
t
s
:
docum
e
n
t
form
a
t of con
f
licts fr
o
m
checkout -m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Mic
h
ael J Gruber
.
mailmap: Entries
for
Alex
Bennée,
Deskin Miller, Vital
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onatha
n
Nieder
revert:
fix tiny me
m
ory leak in
c
h
e
rry-pick --ff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Update d
r
aft releas
e
notes to 1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io C Ha
m
ano
Merge br
a
nch 'jk/main
t
-a
d
d-i
g
nored
-
dir'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge branch
'
m
l
/color-grep'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C
Hamano
Merge
b
ranch 'jc/color-attrs'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Ha
m
ano
Merge bra
n
ch 'cc/res
e
t
-
keep'
commit
|
commitdiff
|
tree
2010-03-20
J
u
n
i
o C Hamano
Merge
b
ranch 'f
l
/askpas
s
'
commit
|
commitdiff
|
tree
2010-03-20
J
u
nio
C
H
amano
M
e
rg
e
b
r
anch 'b
g
/apply-fix-
b
lan
k
-
at-eof'
commit
|
commitdiff
|
tree
2010-03-20
Junio C
H
amano
Me
r
g
e
branch 'bw
/
union-merge-refactor'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Update d
r
aft rel
e
ase notes
t
o
1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
C
h
ristian C
o
ud
e
r
reba
s
e -i: u
s
e new --ff cherr
y
-pick o
p
t
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Andrea
s
Gruenbache
r
f
e
tch: Fix minor memory lea
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gru
e
nbacher
fetch:
Future-proof initialization of
a ref
s
pec o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next