user/sven/git.git/git.c, branch v1.4.4.4

git-pickaxe: retire pickaxe

2006-11-09T02:49:37Z

Just make it take over blame's place. Documentation and command have all stopped mentioning "git-pickaxe". The built-in synonym is left in the command table, so you can still say "git pickaxe", but it probably is a good idea to retire it as well. Signed-off-by: Junio C Hamano

Merge branch 'jc/pickaxe'

2006-11-08T00:33:59Z

branch: work in subdirectories.

2006-11-01T20:53:13Z

Noticed by Andy Whitcroft Signed-off-by: Junio C Hamano

Merge branch 'rs/cherry'

2006-11-01T17:17:37Z

* rs/cherry: Make git-cherry handle root trees Built-in cherry

Merge branch 'lj/refs'

2006-11-01T16:48:50Z

* lj/refs: (63 commits) Fix show-ref usagestring t3200: git-branch testsuite update sha1_name.c: avoid compilation warnings. Make git-branch a builtin ref-log: fix D/F conflict coming from deleted refs. git-revert with conflicts to behave as git-merge with conflicts core.logallrefupdates thinko-fix git-pack-refs --all core.logallrefupdates create new log file only for branch heads. Remove bashism from t3210-pack-refs.sh ref-log: allow ref@{count} syntax. pack-refs: call fflush before fsync. pack-refs: use lockfile as everybody else does. git-fetch: do not look into $GIT_DIR/refs to see if a tag exists. lock_ref_sha1_basic does not remove empty directories on BSD Do not create tag leading directories since git update-ref does it. Check that a tag exists using show-ref instead of looking for the ref file. Use git-update-ref to delete a tag instead of rm()ing the ref file. Fix refs.c;:repack_without_ref() clean-up path Clean up "git-branch.sh" and add remove recursive dir test cases. ...

Merge for-each-ref to sync gitweb fully with 'next'

2006-10-25T20:29:12Z

Merge branch 'jc/web-blame'

2006-10-25T20:18:06Z

* jc/web-blame: gitweb: spell "blame --porcelain" with -p blame: Document and add help text for -f, -n, and -p gitweb: blame porcelain: lineno and orig lineno swapped Remove git-annotate.perl and create a builtin-alias for git-blame gitweb: use blame --porcelain git-blame --porcelain blame.c: move code to output metainfo into a separate function. git-blame: --show-number (and -n) git-blame: --show-name (and -f) blame.c: whitespace and formatting clean-up. Gitweb - provide site headers and footers gitweb: blame: Mouse-over commit-8 shows author and date gitweb: blame: print commit-8 on the leading row of a commit-block Revert 954a6183756a073723a7c9fd8d2feb13132876b0 gitweb: prepare for repositories with packed refs. gitweb: make leftmost column of blame less cluttered.

Make git-branch a builtin

2006-10-24T03:43:49Z

This replaces git-branch.sh with builtin-branch.c The changes is basically a patch from Kristian H�gsberg, updated to apply onto current 'next' Signed-off-by: Lars Hjemli Signed-off-by: Junio C Hamano

Built-in cherry

2006-10-24T03:25:32Z

This replaces the shell script git-cherry with a version written in C. The behaviour of the new version differs from the original in two points: it has no long help any more, and it is handling the (optional) third parameter a bit differently. Basically, it does the equivalent of ours=`git-rev-list $ours ^$limit ^$upstream` instead of ours=`git-rev-list $ours ^$limit` Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

git-pickaxe: pagenate output by default.

2006-10-21T01:37:10Z

Signed-off-by: Junio C Hamano