diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2007-10-15 22:31:47 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-10-15 22:31:47 -0400 |
| commit | d55e7c3acf72413563e695a19f7f66efac442064 (patch) | |
| tree | b12d163ceb3e56e36a90c82b9c075a3401cd00d3 /t/t5515/fetch.br-config-glob-octopus_config-glob | |
| parent | Minor usage update in setgitperms.perl (diff) | |
| parent | Whip post 1.5.3.4 maintenance series into shape. (diff) | |
| download | tgif-d55e7c3acf72413563e695a19f7f66efac442064.tar.xz | |
Merge branch 'maint'
* maint:
Whip post 1.5.3.4 maintenance series into shape.
rebase -i: use diff plumbing instead of porcelain
Do not remove distributed configure script
git-archive: document --exec
git-reflog: document --verbose
git-config: handle --file option with relative pathname properly
clear_commit_marks(): avoid deep recursion
git add -i: Remove unused variables
git add -i: Fix parsing of abbreviated hunk headers
git-config: don't silently ignore options after --list
Clean up "git log" format with DIFF_FORMAT_NO_OUTPUT
Fix embarrassing "git log --follow" bug
Conflicts:
RelNotes
git-rebase--interactive.sh
Diffstat (limited to 't/t5515/fetch.br-config-glob-octopus_config-glob')
0 files changed, 0 insertions, 0 deletions