repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation: remove stray backslashes from "Fighting regressions" article
2010-03-21
Jon
a
than Nie
d
er
cherry-pick, revert: add a label for ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nie
d
er
revert: clarify label
o
n con
f
lict hunks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
i
e
der
compat
:
add me
m
pcpy(
)
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Niede
r
che
c
kout -m --conflict=diff3: add a label fo
r
a
n
cestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
m
e
rge_tre
e
s(): add ancestor label paramet
e
r for diff3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
m
e
rg
e
_f
i
le(): add comment expl
a
i
ni
n
g behavior wrt conflict
.
.
.
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
ch
e
ck
o
u
t
--conf
l
ict=diff
3
: add a label for ancesto
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan N
i
eder
ll_merge(): add a
n
cestor label par
a
m
eter for diff3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
h
an Nieder
merge
-
file
-
-diff3: add a label for
a
ncest
o
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Nieder
xdl_merge()
:
move f
i
le1 and file2
l
ab
e
ls
t
o xmparam
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
xdl_merge():
ad
d
optional
a
n
cestor label
t
o diff3-
s
ty
l
e
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nieder
tests: document cherry-pick behavior in face
of conflicts
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan N
i
eder
tes
t
s:
docum
e
nt format of
c
onflicts f
r
om checkou
t
-
m
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nieder
reve
r
t: fix
tiny
memory lea
k
in
c
h
e
rry-pick
--ff
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan
Nied
e
r
Makefile:
F
ix occa
s
ional GIT-CFLAGS break
a
ge
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Nieder
Make
f
ile: Fix CDPA
T
H
p
roblem
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
J
onathan N
i
ede
r
gi
t
k: D
o
n't
clobber "R
e
member this view" setting
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan N
i
eder
g
i
tk
:
Add comments to explain encode_vie
w
_opts a
n
d
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-28
J
onathan N
i
ede
r
Makefile: clar
i
f
y
d
efiniti
o
n
o
f
T
E
ST_OBJS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-23
Jonathan Nied
e
r
am: remo
v
e
reba
s
e-apply directory bef
o
re
gc
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-22
J
on
a
than N
i
eder
te
s
ts: Fix race
c
on
d
ition in t7006-pa
g
er
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-21
Jonathan
N
ieder
t7006-pag
e
r: if s
t
dout
i
s not a termina
l
, mak
e
a
new one
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-20
Jon
a
tha
n
Nied
e
r
tests: Ad
d
test
s
for autom
a
t
ic us
e
of pag
e
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
J
on
a
than
Nieder
a
m:
F
ix launching of pager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
J
o
nathan N
i
eder
git svn: Fi
x
launching of pager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonatha
n
Ni
e
de
r
git
.
1: Clar
i
fy
t
he behavior of
t
he --paginate option
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonath
a
n Nied
e
r
Make 'gi
t
var GI
T
_PAGER' always p
r
int t
h
e config
u
red
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Niede
r
Fix 'git var' u
s
age synopsis
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jonath
a
n Niede
r
Makefile:
a
lways
remo
v
e
.
de
p
e
n
d director
i
es
o
n 'mak
e
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
J
o
nat
h
an Ni
e
d
er
Makefile: tuck away g
e
nerated makefile
fragments
in
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
J
onatha
n
Nieder
Do
n
o
t
i
n
sta
l
l she
l
l
l
i
b
raries ex
e
cutab
l
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-27
Jonat
h
an N
i
e
d
e
r
Teach Makefile t
o
check hea
d
er dependenc
i
es
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-27
Jon
a
t
han Niede
r
Make
f
i
le:
l
ist
st
a
ndalone
program object
f
iles
i
n
P
ROGRAM_OBJS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jo
n
ath
a
n N
i
eder
Makefile:
l
azil
y
compute header dependenci
e
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jo
n
a
t
han Nie
d
er
Makefile: li
s
t gen
e
rated ob
j
ect
f
iles in OBJECTS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Makefi
l
e:
disable default impli
c
it
rules
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
J
o
nathan Nieder
M
akefile: rearrange dependency rules
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Mak
e
f
i
l
e
: transport
.
o depends
on bran
c
h
.
h now
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan N
i
eder
Merge bran
c
h 'master' of
g
it://
r
epo
.
or
.
cz/alt-git into
.
.
.
commit
|
commitdiff
|
tree
2010-01-26
Jonat
h
an Nieder
Makefil
e
: drop dependen
c
y on $(wildcard */*
.
h)
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nie
d
er
Makefile: clean up http-walke
r
.
o
dependency r
u
les
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Makefile: r
e
move wt-
s
tatu
s
.
h from
LIB_H
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Makefile:
m
a
ke sure test helpers are rebu
i
lt w
h
en heade
r
s
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
J
o
n
athan Nieder
Makefile:
add
missing h
e
ader
file
dependencies
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
J
o
nathan Nieder
Documentation: merge: use MERG
E
_HEAD to refer to the
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonatha
n
N
i
eder
Documentation: sim
p
lify How Merge Works
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nieder
Documentation: merge: add a section
a
b
out fast-
f
orw
a
rd
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nieder
Document
a
tion: emphasize when git m
e
rge terminates
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonath
a
n Ni
e
d
er
Documen
t
ation:
mer
g
e: add an overview
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
J
onathan Nieder
Docu
m
enta
t
ion
:
merge: move merge
strateg
y
l
ist to
e
n
d
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jona
t
han Nied
e
r
Do
c
ument
a
tion: suggest `reset --m
e
rge` in H
o
w Mer
g
e
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonatha
n
Ni
e
der
Docu
m
e
ntatio
n
: merge:
m
ov
e
con
f
iguration section to end
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jon
a
than Nieder
Do
c
umentation: tiny
g
it
c
onfig manual twea
k
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jonathan Nied
e
r
Documenta
t
ion: git gc packs refs by defau
l
t
n
ow
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jonat
h
an Nieder
D
o
cumen
t
ation
:
t
iny git config
manual twe
a
ks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
J
o
nathan Nieder
Documentat
i
on: git gc packs refs by d
e
fault now
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-07
Jonatha
n
Nieder
git-g
u
i:
M
akefile: consolidate
.
FORCE-* targets
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan Nieder
M
akefile
:
consolid
a
t
e
.
F
ORCE-*
t
argets
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
J
o
n
a
than Nieder
Makefil
e
: learn to genera
t
e listings for targets
r
e
q
uiring
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan Nieder
M
akefile: use target-s
p
e
cific var
i
able
to pass
f
lag
s
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan Nieder
Makefile: reg
e
n
e
rate asse
m
bler listin
g
s whe
n
asked
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jonath
a
n Nieder
Ma
k
efile: make ppc/sha1ppc
.
o dep
e
nd on GIT-CFLAGS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-28
Jo
n
atha
n
Nie
d
er
Makefile:
d
o
n
ot cle
a
n arm direc
t
ory
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-18
Jonatha
n
Nieder
Speed u
p
bash
completion
l
oad
i
ng
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jona
t
han Nied
e
r
Provide a build tim
e
d
e
fau
l
t-editor setting
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan
Nieder
a
m -i, g
i
t-svn: use "git
v
ar GIT_PAGER"
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Nieder
add -i, send-email, svn, p4, etc
:
us
e
"git
var GIT_EDI
T
OR"
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jona
t
han Nieder
Teach git var about
GIT_PA
G
ER
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Nieder
Teach gi
t
v
a
r
about GIT_EDITOR
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
J
o
nathan Ni
e
der
Su
p
press warnings from "git var
-
l"
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonath
a
n N
i
eder
Do not use VIS
U
AL editor on dumb te
r
minal
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nie
d
er
diff --no-ind
e
x: make the usage s
t
ring
less
scary
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jon
a
than Nieder
merge-{recur
s
i
ve,sub
t
ree}: us
e
usagef() to pri
n
t
us
a
g
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
I
n
troduce
u
s
ag
e
f()
that
takes a printf-
s
tyle
form
a
t
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
o
nathan
N
ieder
L
et 'gi
t
<command> -h' sho
w
usage without a git dir
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
S
h
ow usag
e
stri
n
g for
'
git http-pus
h
-h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nie
d
er
Let 'git
h
t
tp-fetch
-h' show usage outside any gi
t
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
o
nathan
N
iede
r
Show usage string for 'git stripspace
-h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
o
nathan Nieder
Show usage string for 'gi
t
u
n
p
ack-
f
ile -
h
'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Ni
e
der
S
h
o
w
usa
g
e string for 'git
sh
o
w
-
i
n
dex
-
h
'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan
N
ie
d
er
Show usage
s
tring f
o
r
'
git rev-pars
e
-h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
Show us
a
ge string fo
r
'git merg
e
-one-fi
l
e
-h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
onathan N
i
ed
e
r
Show usage
s
tring
for 'git mailsplit
-
h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
Show usage s
t
r
i
ng for 'git imap-send
-
h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan N
i
ed
e
r
Show u
s
age string for
'
git get-
t
ar-commi
t
-id -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
o
nathan Nieder
S
how u
s
age string for 'git
f
ast-import -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jo
n
a
t
han Nieder
Show
usage strin
g
f
or '
g
it check-ref-
f
o
rmat -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jon
a
than Nieder
http-fetch:
add missing initializ
a
ti
o
n of argv0_p
a
th
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan N
i
ede
r
merge: do not setup work
t
re
e
twic
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
onathan Nieder
check-ref-format:
update u
s
a
g
e string
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Ni
e
der
Show usage string for
'
git show-
r
ef -h
'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan
Nieder
S
h
ow usage string for 'git merge-
o
urs -h
'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jona
t
han Nieder
Show usag
e
s
tring
f
or 'git co
m
mit-tree -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jona
t
han Niede
r
Show usage
s
tring for 'git
cherry
-
h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jon
a
t
h
an Nieder
Show usag
e
s
tring for
'
g
it grep -
h
'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonat
h
an Nieder
Retire fetc
h
-
-tool he
l
p
e
r to
contrib/exampl
e
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-09
Jonathan
N
i
e
d
e
r
Add intermed
i
ate build products to
.
gitignore
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-31
Jonathan
N
iede
r
Handl
e
mo
r
e she
l
l
m
e
t
acharacte
r
s in editor na
m
es
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-30
Jonat
h
an
N
ied
e
r
clone: dete
c
t extra argum
e
nts
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-13
J
onath
a
n Nieder
c
h
e
c
k-ref-format:
s
impl
i
f
y
--print imple
m
entation
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
next